Package: openrocket
Version: 12.03-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Transition package to use default java implementation:
- d/control: BD on default-jdk, switch runtime dependency to
default-jre | java6-runtime.
- d/rules: Specify source/target = 1.5 to ensure that
backwards compatible bytecode is built.
Ubuntu quantal is transitioning default java from openjdk-6 to openjdk-7. This
patch eases the transition and ensures backwards compatible bytecode is built.
Note that this is not a release goal for wheezy.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers quantal-updates
APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500,
'quantal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.5.0-8-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJQIRzYAAoJEL/srsug59jD12oP/133guIH7QYezjhi6lgEZ0Pq
+uZ3M3ZGvgLH7De0tlkbK7mKnYXx07F0TWNuLyD1BtDTFOzSS2v9HX9eOTKxtaCT
TANZcf1YaDb5MoeYGwJ2uWDTDRR2txcRnqejDtVlBZLahUeuoUsKJReQoMNPypix
WJByzwMj35jFDNi8QyO+e8llKR3TMcybYkl1eObn6d6bDqsvRQm7djQv+v6tpECP
/MVBrsLIGVxsFbluY7IPLikJ0TyiHRIRH+t83VFm6QgOnutVTOdEg7I8HGeQ73BJ
e6YDCQpx0lHXuYxZlNp7hNAJkI3dnJVs3OTt/7doLsM3hQuM/rrzWNSSgPVcl+eB
VJXVwurEopmMy1zTYDu0ko0XV6URMU3pAQhDfKClvburzb6jIGgWVGaaQKZsyD3D
zJ864ArtYgcKHDvG5eK/deEZsJxrhWtCOgHehLwOq/iLrEFYCxdwptyWm9WpND03
TSqoJv8JQIL5J62PtwMPgK+ZcRRtClsodPLJZcQAHy/gsfFz0iHz13y+FtSxpAhm
9J8nbtMFjZecY7mZPLNK06aCD1EsX6W4fXf7hch+G0j8cbr/hcaK5qnmHsTCalsP
3M7Li0jGur+ntadbYDLub1pHd0OxqJqeBRUr8pE0DYBNiD9Z1KMKLV/03xMUg2CT
HPdJ6nptsdHpuYfNkiAS
=isY8
-----END PGP SIGNATURE-----
diff -Nru openrocket-12.03/debian/changelog openrocket-12.03/debian/changelog
diff -Nru openrocket-12.03/debian/control openrocket-12.03/debian/control
--- openrocket-12.03/debian/control 2012-03-18 23:04:37.000000000 +0000
+++ openrocket-12.03/debian/control 2012-08-07 14:45:48.000000000 +0100
@@ -2,7 +2,7 @@
Section: science
Priority: optional
Maintainer: Bdale Garbee <bd...@gag.com>
-Build-Depends: debhelper (>= 7.0.50~), openjdk-6-jdk, ant, ant-optional, libjcommon-java, libjfreechart-java, libmiglayout-java, junit4, libitext5-java, netpbm
+Build-Depends: debhelper (>= 7.0.50~), default-jdk, ant, ant-optional, libjcommon-java, libjfreechart-java, libmiglayout-java, junit4, libitext5-java, netpbm
Standards-Version: 3.9.3
Homepage: http://openrocket.sourceforge.net/
Vcs-Git: git://git.gag.com/debian/openrocket
@@ -10,7 +10,7 @@
Package: openrocket
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | sun-java6-jre, libjcommon-java, libjfreechart-java, libmiglayout-java, libitext5-java
+Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java6-runtime, libjcommon-java, libjfreechart-java, libmiglayout-java, libitext5-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 -Nru openrocket-12.03/debian/rules openrocket-12.03/debian/rules
--- openrocket-12.03/debian/rules 2012-03-18 23:04:37.000000000 +0000
+++ openrocket-12.03/debian/rules 2012-08-07 14:42:17.000000000 +0100
@@ -13,7 +13,9 @@
dh $@
override_dh_auto_build:
- ant -f core/build.xml dist-bin
+ ant -f core/build.xml \
+ -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
+ dist-bin
override_dh_auto_install:
cp core/build/jar/* `pwd`/debian/openrocket/usr/share/java/
