Package: jfractionlab
Version: 0.91-2
Severity: normal
Tags: patch
User: [email protected]
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: Use default-{jdk|jre} instead of openjdk-6-{jdk|jre}.
- d/rules: Set JAVA_HOME to /usr/lib/jvm/default-java, specify
source/target = 1.5 to ensure bytecode is backwards compatible.
This ensures that this package builds and executes against the default
java version in the distro - this has changed for Ubuntu quantal and I would
expect Debian to follow next release.
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-7-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)
iQIcBAEBCAAGBQJQGVoTAAoJEL/srsug59jDSTkP/A0Wudh8R06KYNAU4T8WMOnS
RVUMm5nMaV4Gr++NKVz07Pxd+NUWiNCpsHEvjDCRla6/haYsaEUkFHo9MgDgZMKj
YdVS0oHK8nkp6f4S4srpyPx3sWbzS4RCJBh8IdI+sGHtMto5d9uKiVSOlyrTnI6Z
w4QIso2yRvaAEnTOcE4YC5DHXxf94rjxiyf8dk721uNCfmQaN+MMQtg5yyML0sAe
qS021iKB+hlciLDJrRTF5vvACLUqyrQNNsWJDMT/bRRhjp4i+CFwa9io0pSV0Aa9
o4owBN5hY36oqT4qDTrZcbdWPRzlQdMKRqCQhH4d1rVMesVrMifoE4jyQNZv4QLq
0GW/6v62R9um0a5ImCqSr/bGFEUH6KzPzl841bMSsofzrXve16zxwAesNzDVEMXb
P1XSlVFWrq71MLhu8bPKHWqOVcbQc5lm0bqaNfNhtg2aYj/8LTRMewCbVd+Pczpn
ZzNkdAPKNmiVM/shvwIYjrEkxrzfXiE373BeGtcpRRkiABQo6rwPvkm0PDCJs+tj
5NUrsXfJDfOOC5mwxBZMJl6DpBxlo6pyNJ4DsDgfYMZMo1zWMHrPVV6LxXUv57PQ
dZPAS6wgSqDBVnFCeWN+J714ZsFNsmcPC9jUTkNVhBBem/sR7ZX0V7SYUhX6WO5y
y4qf+d1ylPBzp/Lpikrm
=Gfji
-----END PGP SIGNATURE-----
diff -Nru jfractionlab-0.91/debian/changelog jfractionlab-0.91/debian/changelog
diff -Nru jfractionlab-0.91/debian/control jfractionlab-0.91/debian/control
--- jfractionlab-0.91/debian/control 2011-12-23 12:15:53.000000000 +0000
+++ jfractionlab-0.91/debian/control 2012-08-01 17:30:31.000000000 +0100
@@ -2,13 +2,13 @@
Section: math
Priority: extra
Maintainer: José L. Redrejo RodrÃguez <[email protected]>
-Build-Depends: debhelper (>= 7), openjdk-6-jdk, libtablelayout-java, libreoffice-java-common | openoffice.org-java-common
+Build-Depends: debhelper (>= 7), default-jdk, libtablelayout-java, libreoffice-java-common | openoffice.org-java-common
Standards-Version: 3.9.2
Homepage: http://jfractionlab.sourceforge.net/
Package: jfractionlab
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java6-runtime, libtablelayout-java
+Depends: ${misc:Depends}, default-jre | java6-runtime, libtablelayout-java
Recommends: libreoffice.org-calc | openoffice.org-calc, libreoffice.org-writer | openoffice.org-writer
Description: Educative program to practice fractions
JFractionLab is a nice tool for math students that are learning the use
diff -Nru jfractionlab-0.91/debian/rules jfractionlab-0.91/debian/rules
--- jfractionlab-0.91/debian/rules 2012-01-08 10:04:33.000000000 +0000
+++ jfractionlab-0.91/debian/rules 2012-08-01 17:27:55.000000000 +0100
@@ -2,7 +2,7 @@
# -*- makefile -*-
DEB_BUILD_ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-JAVA_HOME=/usr/lib/jvm/java-6-openjdk-$(DEB_BUILD_ARCH)/
+JAVA_HOME=/usr/lib/jvm/default-java
UNOIL_PATH1= $(shell dpkg -L libreoffice-java-common | grep share | grep unoil.jar)
UNOIL_PATH2= $(shell dpkg -L openoffice-java-common | grep share | grep unoil.jar)
UNOIL_PATH=$(UNOIL_PATH1)$(UNOIL_PATH2)
@@ -14,11 +14,13 @@
build-indep: build-stamp
+JAVA_ARGS=-source 1.5 -target 1.5
+
build-stamp:
dh_testdir
#compile java sources
- find src/jfractionlab -name *.java -and -type f -print0 | xargs -0 /usr/bin/javac -client -cp ${CLASSPATH}
- find src/lang -name *.java -and -type f -print0 | xargs -0 /usr/bin/javac -client -cp ${CLASSPATH}
+ find src/jfractionlab -name *.java -and -type f -print0 | xargs -0 /usr/bin/javac -client ${JAVA_ARGS} -cp ${CLASSPATH}
+ find src/lang -name *.java -and -type f -print0 | xargs -0 /usr/bin/javac -client ${JAVA_ARGS} -cp ${CLASSPATH}
#create help jars:
/usr/bin/jar cf Help_de.jar -C doc/help_de/ .
/usr/bin/jar cf Help_en.jar -C doc/help_en/ .
