Merge branch 'debian' into wheezy

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index d1f07c5845cd6e04dd8506431dcb0552c196274d..06c23b7c71b21f51f4c6dba6d0da028e38963aac 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+openrocket (13.11.1~bpo60+1) wheezy-backports; urgency=low
+
+  * new upstream version released, update package to trigger user updates
+
+ -- Bdale Garbee <bdale@gag.com>  Sun, 10 Nov 2013 10:44:55 -0800
+
+openrocket (13.11.1) unstable; urgency=low
+
+  * new upstream version released, update package to trigger user updates
+
+ -- Bdale Garbee <bdale@gag.com>  Sun, 10 Nov 2013 10:21:26 -0800
+
 openrocket (13.09.1~bpo60+1) wheezy-backports; urgency=low
 
   * new upstream version released, update package to trigger user updates

diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644 (file)
index 0000000..191c3a5
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch = wheezy