Package: latexdraw
Version: 2.0.8+1-3
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 default java implementation:
- d/control: BD on default-jdk, Switch runtime dependency to
default-jre | java6-runtime.
- d/rules: Prefer /usr/lib/jvm/default-java for JAVA_HOME.
Ubuntu is transitioning from openjdk-6 to openjdk-7 as default java; this patch
eases the transition. Note that this transition is not a wheezy release goal.
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)
iQIcBAEBCAAGBQJQH5kpAAoJEL/srsug59jDLc0P/Rkm51X8QkXK7fEvY99OecrQ
BAtlAXfPPDkKhF6xUJb9EzUfQRrcynPPytHj1LC7k62uPa258HcgXRQxJkwMe9WI
7i9Ps/JWuPvWlJ+9LckV0R3vcUbAnxu1S+1Atl2Y0ZRzpqdsz8/au3COYEYPF4tB
aNP2UOs6S4Wuzx1ccxtVncK5Td5Pd1Ja+Tt4zvOYJ4PCatGt0b+r7Mf+Dj2ngiQ1
SF8Xfey/cqUz5lGtbmDU1YkO2XMd6JRGoEKqnO9KllmfyJxq3bVvYluiNQZ3cvcA
/2VEuCjJLr3U5ZMv2BJae3g/tBso/SLhc/dln2MB1koqGGRYolPzv7o/x7mpJRxl
wI8imp9M4jQA9B2V7QYTHRpEK4jCdx1rTOIl03aSVnTaIa9yOUWkYb9muq9RTbgO
FSq9uGhUDdIODgRdVDnTiWFjNvAJMp5U+pw2brBTvD1VNvDPl3cFPwVabOZ+ieTs
yzVcfAFSbR9QQ7FFNzGdHKzF/jVsj6f43icFT2xOGpGyzLXWmmImvkrhefWcOxC6
bvROEqYcdxRFmTiYDMEGLULd3uQuLNfdNGzX0zTlO2b3zLqWjyBuyPDX0zhL4PGb
3ukuwW27D7uxD+GhYJFLJLbMFCI1m+YX5jx9F4nSaVptLkpCozFIvdk5Su7XUWRn
YPhQoGzL9lnRBKdjZ3X6
=bv9v
-----END PGP SIGNATURE-----
diff -Nru latexdraw-2.0.8+1/debian/changelog latexdraw-2.0.8+1/debian/changelog
diff -Nru latexdraw-2.0.8+1/debian/control latexdraw-2.0.8+1/debian/control
--- latexdraw-2.0.8+1/debian/control 2012-06-20 00:24:59.000000000 +0100
+++ latexdraw-2.0.8+1/debian/control 2012-08-06 11:13:43.000000000 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Stuart Prescott <stuart+deb...@nanonanonano.net>
Build-Depends: debhelper (>= 7.3.5~)
-Build-Depends-Indep: openjdk-7-jdk | openjdk-6-jdk,
+Build-Depends-Indep: default-jdk,
ant,
imagemagick,
libjiu-java,
@@ -14,7 +14,7 @@
Package: latexdraw
Architecture: all
-Depends: openjdk-7-jre | openjdk-6-jre | sun-java6-jre,
+Depends: default-jre | java6-runtime,
libjiu-java,
libjlibeps-java,
java-wrappers,
diff -Nru latexdraw-2.0.8+1/debian/rules latexdraw-2.0.8+1/debian/rules
--- latexdraw-2.0.8+1/debian/rules 2012-06-20 00:01:37.000000000 +0100
+++ latexdraw-2.0.8+1/debian/rules 2012-08-06 11:07:56.000000000 +0100
@@ -11,6 +11,7 @@
# to build locally using openjdk-7.
JAVA_HOME ?= $(shell echo \
` for jre in \
+ /usr/lib/jvm/default-java \
/usr/lib/jvm/java-7-openjdk-\`dpkg-architecture -qDEB_BUILD_ARCH\` \
/usr/lib/jvm/java-6-openjdk-\`dpkg-architecture -qDEB_BUILD_ARCH\` \
/usr/lib/jvm/java-6-openjdk \
