Merge branch 'v1.1.0' into debian

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index b821ea9e2d58b2b0a919e36c5fc81f0ad63dff3e..a8c3a0e57b450a5c6b59084b9d0dfea88f5d5228 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,19 @@ openrocket (1.1.0-1) unstable; urgency=low
 
  -- 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 --git a/debian/control b/debian/control
index a6ec8c79f5c28387b419a1c76587ffc766d54a2d..484880790d69903ddec524e1e18c32aeb97e4e0f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ 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 

diff --git a/debian/patches/debian-build.source.diff b/debian/patches/debian-build.source.diff
new file mode 100644 (file)
index 0000000..a9c5815
--- /dev/null
+++ b/debian/patches/debian-build.source.diff
@@ -0,0 +1,13 @@
+diff --git a/build.properties b/build.properties
+index 73ec3d0..e0cd5fa 100644
+--- a/build.properties
++++ b/build.properties
+@@ -8,7 +8,7 @@ build.version=1.0.0
+ # distribution (Debian, Fedora etc.), this should be changed appropriately!
+ # This is included in bug reports to identify the source of the software.
+ 
+-build.source=default
++build.source=Debian
+ 
+ 
+ # Whether checking for updates is enabled by default.

diff --git a/debian/patches/series b/debian/patches/series
index 90e3f12318f39f8965bbf86704f1eceb76d619ad..dd53df8fa4d462da87004a341aa17f2c2466ee90 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+debian-build.source.diff
 openjdk-is-ok.diff
 use-system-libs.diff

diff --git a/debian/rules b/debian/rules
index 7d90115169ed0dba2a029c48edd3f08380a51d71..b4e78103421da73c134e4b28124c50969d959f6c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,8 @@ override_dh_auto_build:
 
 override_dh_auto_install:
        cp build/jar/* `pwd`/debian/openrocket/usr/share/java/
-       echo "#!/bin/sh\njava -jar /usr/share/java/`/bin/ls build/jar`" > \
+       printf '#!/bin/sh\njava -jar /usr/share/java/%s\n' \
+               "`/bin/ls build/jar`" > \
                `pwd`/debian/openrocket/usr/bin/openrocket
 
 override_dh_installman: