Merge branch 'v1.1.0' into debian

Conflicts:
	debian/changelog

diff --combined debian/changelog
index ed356b6a92fb4278b718b397e49168c66a6ad706,b821ea9e2d58b2b0a919e36c5fc81f0ad63dff3e..a8c3a0e57b450a5c6b59084b9d0dfea88f5d5228
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,10 +1,23 @@@
+ openrocket (1.1.0-1) unstable; urgency=low
+ 
+   * new upstream version
+   * update build deps
+ 
+  -- Bdale Garbee <bdale@gag.com>  Tue, 03 Aug 2010 22:50:39 -0400
+ 
 +openrocket (1.0.0-3) unstable; urgency=low
 +
 +  * fix bashism in debian/rules file, closes: #581463
 +
 + -- Bdale Garbee <bdale@gag.com>  Wed, 12 May 2010 23:48:04 -0600
 +
 +openrocket (1.0.0-2) unstable; urgency=low
 +
 +  * fix missing dependencies on Java libraries, closes: #575151
 +  * update build.source to brand build as Debian's at upstream request
 +
 + -- Bdale Garbee <bdale@gag.com>  Tue, 23 Mar 2010 16:54:38 -0600
 +
  openrocket (1.0.0-1) unstable; urgency=low
  
    * initial packaging for Debian

diff --combined debian/control
index 8b1138a453367c977dd81c58f2372ae10ce56e0e,a6ec8c79f5c28387b419a1c76587ffc766d54a2d..484880790d69903ddec524e1e18c32aeb97e4e0f
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -3,13 -3,13 +3,13 @@@ Section: scienc
  Priority: optional
  Maintainer: Bdale Garbee <bdale@gag.com>
  Build-Depends: debhelper (>= 7.0.50~), openjdk-6-jdk, ant, ant-optional, libjcommon-java, libjfreechart-java, libmiglayout-java, junit4
- Standards-Version: 3.8.4
+ Standards-Version: 3.9.1
  Homepage: http://openrocket.sourceforge.net/
  Vcs-Git: git://git.gag.com/debian/openrocket
  
  Package: openrocket
  Architecture: all
 -Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | sun-java6-jre
 +Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | sun-java6-jre, libjcommon-java, libjfreechart-java, libmiglayout-java
  Description: Model Rocket Simulator
   OpenRocket is a free, fully featured model rocket simulator that allows 
   you to design and simulate your rockets before actually building and