Bug#683550: jfractionlab: diff for NMU version 0.91-2.1

[gregor herrmann]

tags 683550 + pending
thanks

Dear maintainer,

I've prepared an NMU for jfractionlab (versioned as 0.91-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Sting: Driven To Tears

diff -Nru jfractionlab-0.91/debian/changelog jfractionlab-0.91/debian/changelog
--- jfractionlab-0.91/debian/changelog	2012-01-08 11:07:12.000000000 +0100
+++ jfractionlab-0.91/debian/changelog	2013-05-21 21:37:09.000000000 +0200
@@ -1,3 +1,21 @@
+jfractionlab (0.91-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "Transition package to default java implementation; fix java7
+    compatibility":
+    apply patch from Ubuntu / James Page:
+
+    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.
+
+    Additionally remove now unused DEB_BUILD_ARCH variable from debian/rules.
+
+    (Closes: #683550)
+
+ -- gregor herrmann <gre...@debian.org>  Tue, 21 May 2013 21:36:10 +0200
+
 jfractionlab (0.91-2) unstable; urgency=low
 
   * Fixed desktop file generic name entries. Thanks to Ronny Standtke.
diff -Nru jfractionlab-0.91/debian/control jfractionlab-0.91/debian/control
--- jfractionlab-0.91/debian/control	2011-12-23 13:15:53.000000000 +0100
+++ jfractionlab-0.91/debian/control	2013-05-21 21:35:27.000000000 +0200
@@ -2,13 +2,13 @@
 Section: math
 Priority: extra
 Maintainer: José L. Redrejo Rodríguez <jredr...@debian.org>
-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 11:04:33.000000000 +0100
+++ jfractionlab-0.91/debian/rules	2013-05-21 21:35:54.000000000 +0200
@@ -1,8 +1,7 @@
 #!/usr/bin/make -f
 # -*- 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 +13,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/ .

signature.asc
Description: Digital signature