Merge branch 'debian' into wheezy

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 17123a877da42c5bbd68cafe11660c9733d72d86..e9f6026ecb5adf8b7c8833252bfd4cfaef5f15e8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openrocket (14.06~bpo60+1) wheezy-backports; urgency=low
+
+  * freshen backport to actually work with current versions of openrocket
+
+ -- Bdale Garbee <bdale@gag.com>  Thu, 26 Jun 2014 09:33:52 -0600
+
 openrocket (14.06) unstable; urgency=low
 
   * new upstream version released, update package to trigger user updates
@@ -23,12 +29,24 @@ openrocket (14.03) unstable; urgency=low
 
  -- Bdale Garbee <bdale@gag.com>  Fri, 21 Mar 2014 10:52:49 -0600
 
+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
+
+ -- Bdale Garbee <bdale@gag.com>  Sun, 08 Sep 2013 15:07:25 -0600
+
 openrocket (13.09.1) unstable; urgency=low
 
   * new upstream version released, update package to trigger user updates

diff --git a/debian/control b/debian/control
index df10b5a1240197004a8c3b3fe4df1a9ed98e4bec..e1a42cc8b47393a2426cba5eb4f6d4cd929ad30a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -20,5 +20,5 @@ Description: Model Rocket Simulator
  wind modeling, a multitude of different components including free-form 
  and canted fins, clustering and staging. 
  .
- This package therefore downloads the pre-built OpenRocket .jar file from
- the upstream site and installs it.
+ This package downloads the pre-built OpenRocket .jar file from the 
+ upstream site and installs it.

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 88406753d59abe93e4a81f36c0fdc36eaf754bb0..191c3a522588673be33cf6e4cc133f0af8783dde 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,2 @@
 [DEFAULT]
-debian-branch = debian
+debian-branch = wheezy