tags 684154 + pending
thanks

Dear maintainer,

I've prepared an NMU for libusb-java (versioned as 0.8+ztex20090101-5.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: Cat Stevens: Wild World
diff -Nru libusb-java-0.8+ztex20090101/debian/changelog libusb-java-0.8+ztex20090101/debian/changelog
--- libusb-java-0.8+ztex20090101/debian/changelog	2012-09-16 20:52:12.000000000 +0200
+++ libusb-java-0.8+ztex20090101/debian/changelog	2013-05-22 18:41:33.000000000 +0200
@@ -1,3 +1,22 @@
+libusb-java (0.8+ztex20090101-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "Transition package to use default java implementation + java 7
+    compatibility": apply patch from Ubuntu / James Page
+    (after adjusting it to apply against -5):
+
+    Transition package to use default java implementation:
+    - d/control: BD on default-jdk (>= 1:1.6).
+    - d/rules: Specify source = 1.5 during javadoc generation.
+    - d/patches/java-compat.patch: Specify source/target = 1.5 to ensure
+      that bytecode is backwards compatible and avoid Java 7 errors.
+
+    Additionally add -encoding to d/rules and d/patches/java-compat.patch
+
+    (Closes: #684154)
+
+ -- gregor herrmann <gre...@debian.org>  Wed, 22 May 2013 18:41:11 +0200
+
 libusb-java (0.8+ztex20090101-5) unstable; urgency=low
 
   * Fix of FTBFS stimulated by patch from Konstantinos Margaritis
diff -Nru libusb-java-0.8+ztex20090101/debian/control libusb-java-0.8+ztex20090101/debian/control
--- libusb-java-0.8+ztex20090101/debian/control	2012-09-14 23:22:09.000000000 +0200
+++ libusb-java-0.8+ztex20090101/debian/control	2013-05-22 18:28:04.000000000 +0200
@@ -2,7 +2,7 @@
 Section: java
 Priority: extra
 Maintainer: Steffen Moeller <moel...@debian.org>
-Build-Depends: debhelper (>= 8.0.0), openjdk-6-jdk|sun-java6-jdk|java6-jdk|java2-compiler, libusb-dev
+Build-Depends: debhelper (>= 8.0.0), default-jdk (>= 1:1.6), libusb-dev
 Standards-Version: 3.9.3
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-escience/libusb-java/trunk
 Vcs-Svn: svn://svn.debian.org/pkg-escience/libusb-java/trunk
diff -Nru libusb-java-0.8+ztex20090101/debian/patches/java-compat.patch libusb-java-0.8+ztex20090101/debian/patches/java-compat.patch
--- libusb-java-0.8+ztex20090101/debian/patches/java-compat.patch	1970-01-01 01:00:00.000000000 +0100
+++ libusb-java-0.8+ztex20090101/debian/patches/java-compat.patch	2013-05-22 18:40:01.000000000 +0200
@@ -0,0 +1,18 @@
+Description: Ensure source/target is specified so that
+ bytecode is backwards compatible/avoiding encoding errors.
+Author: James Page <james.p...@ubuntu.com>
+Forwarded: no
+
+Index: libusb-java-0.8+ztex20090101/Makefile
+===================================================================
+--- libusb-java-0.8+ztex20090101.orig/Makefile 2012-08-07 13:31:24.000000000 +0100
++++ libusb-java-0.8+ztex20090101/Makefile  2012-08-07 13:37:22.199906759 +0100
+@@ -22,7 +22,7 @@
+ GCC=gcc
+ STRIP=strip
+ CHMOD=chmod -x
+-JAVAC=javac
++JAVAC=javac -source 1.5 -target 1.5 -encoding ISO-8859-1
+ RM=rm -f
+ INSTALL=install
+ INSTALLDIR=$(INSTALL) -d
diff -Nru libusb-java-0.8+ztex20090101/debian/patches/series libusb-java-0.8+ztex20090101/debian/patches/series
--- libusb-java-0.8+ztex20090101/debian/patches/series	2012-09-16 20:53:43.000000000 +0200
+++ libusb-java-0.8+ztex20090101/debian/patches/series	2013-05-22 18:27:09.000000000 +0200
@@ -1,2 +1,3 @@
 jniInclude.patch
 sharedLibraries.patch
+java-compat.patch
diff -Nru libusb-java-0.8+ztex20090101/debian/rules libusb-java-0.8+ztex20090101/debian/rules
--- libusb-java-0.8+ztex20090101/debian/rules	2012-09-16 20:52:12.000000000 +0200
+++ libusb-java-0.8+ztex20090101/debian/rules	2013-05-22 18:38:52.000000000 +0200
@@ -22,7 +22,7 @@
 	$(MAKE) STRIP="# not stripping: " classes
 	jar cf libusb.jar `find ch -name "*.class"`
 	[ -d $(DOCPATH) ] || mkdir -p $(DOCPATH)
-	javadoc -classpath . -d $(DOCPATH) ch.ntb.usb
+	javadoc -source 1.5 -encoding ISO-8859-1 -classpath . -d $(DOCPATH) ch.ntb.usb
 	touch build-indep-stamp
 
 LIBPACKAGE=libusb-java-lib

Attachment: signature.asc
Description: Digital signature

Reply via email to