Merge branch 'debian' into wheezy

Conflicts:
	debian/changelog

diff --combined debian/changelog
index 06c23b7c71b21f51f4c6dba6d0da028e38963aac,17123a877da42c5bbd68cafe11660c9733d72d86..e9f6026ecb5adf8b7c8833252bfd4cfaef5f15e8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,34 +1,52 @@@
++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
+ 
+  -- Bdale Garbee <bdale@gag.com>  Thu, 26 Jun 2014 09:25:32 -0600
+ 
+ openrocket (14.05) unstable; urgency=low
+ 
+   * new upstream version released, update package to trigger user updates
+   * another tweak to upstream download url discovery .. sigh
+ 
+  -- Bdale Garbee <bdale@gag.com>  Tue, 20 May 2014 20:25:57 -0600
+ 
+ openrocket (14.03.1) unstable; urgency=low
+ 
+   * handle change in upstream web content, flakey ReleaseNotes
+ 
+  -- Bdale Garbee <bdale@gag.com>  Sat, 03 May 2014 17:45:48 -0600
+ 
+ openrocket (14.03) unstable; urgency=low
+ 
+   * new upstream version released, update package to trigger user updates
+ 
+  -- 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 --combined debian/control
index 2029ff6f4ffd776da91e7d2a6f98da846d663965,df10b5a1240197004a8c3b3fe4df1a9ed98e4bec..e1a42cc8b47393a2426cba5eb4f6d4cd929ad30a
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -3,7 -3,7 +3,7 @@@ Section: scienc
  Priority: optional
  Maintainer: Bdale Garbee <bdale@gag.com>
  Build-Depends: debhelper (>= 9)
- Standards-Version: 3.9.4
+ Standards-Version: 3.9.5
  Homepage: http://openrocket.sourceforge.net/
  Vcs-Git: git://git.gag.com/debian/openrocket
  Vcs-Browser: http://git.gag.com/?p=debian/openrocket
@@@ -20,5 -20,5 +20,5 @@@ Description: Model Rocket Simulato
   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.