Package: libusb-java
Version: 0.8+ztex20090101-4
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: 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.
Ubuntu quantal is transitioning default java from openjdk-6 to openjdk-7.
This patch ensures that default-jdk is used during the build (which will ease
furture transitions) and that the resulting bytecode is backwards
compatibility with earlier versions of java.
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)
iQIcBAEBCAAGBQJQIQ5/AAoJEL/srsug59jD1E0P/34EmE0pXDME7nxS5FAmMMeq
aXK4AjGaqoNnsjBAyf9UazSgF7utMvNQhlHaxjlBu96ESB48MzJPQuiItdfM3UaE
TJ27nWTel7DKyZm0QbaEpStaGdSsUPO8y+1GkVeR/YCztVVCyBLiIqJU69QJw2ZM
Fy/ihX8wT2x5qMzu2pEIrPuo49mK1IrK+pQY6IoehsDB7SfR+KW8hPUDtTmsok7f
z6DXVSAeruUAwPohrQPPBiifTrqrKAcxpXxiv2P3o0TEU0wNaBZinA+q+m9wj/1T
GRnJ4URqaIhKaJOZwlxM6nBI352g/Myw0Fx98/4UcemNh6vs8t8y9N6Frky3Wx5N
GaOI5LwRvBSakKV+e49A26+QXtN7pcTFgxkdoxfgHQHHLVR4Uql/BqJuNbeRgP7I
eHJWmL8UjXov9SgEDZxQtLm++P3ML8TaSkVVaIp8QjHfSd/nzSBg+ipeE8dF+Unt
bx2CSDt10r01Vrg0gNQ4FNW5SNtkOpqJ5cJln9svgaZuzUrROmbG4ajy9wRhGDHW
LaarhdQ7GHpwznw6sr59833CT9ilfGahN1+htlbxIPZ7pBr4AX7qcRXLLUW6jP4n
0SFRMINEa3QNghP8u/g6viK1zSLqUvujsbTd7hkbBAS54iEhBFEavqFCD5DkX24n
TWpGkCGOyio2KUxusvy5
=f7fa
-----END PGP SIGNATURE-----
diff -Nru libusb-java-0.8+ztex20090101/debian/changelog libusb-java-0.8+ztex20090101/debian/changelog
diff -Nru libusb-java-0.8+ztex20090101/debian/control libusb-java-0.8+ztex20090101/debian/control
--- libusb-java-0.8+ztex20090101/debian/control 2012-07-03 15:21:50.000000000 +0100
+++ libusb-java-0.8+ztex20090101/debian/control 2012-08-07 13:44:21.000000000 +0100
@@ -1,7 +1,7 @@
Source: libusb-java
Section: java
Priority: extra
Maintainer: Steffen Moeller <[email protected]>
-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.2
Homepage: http://libusbjava.sf.net
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 2012-08-07 13:38:10.000000000 +0100
@@ -0,0 +1,18 @@
+Description: Ensure source/target is specified so that
+ bytecode is backwards compatible/avoiding encoding errors.
+Author: James Page <[email protected]>
+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
+@@ -20,7 +20,7 @@
+ ###############################
+ GCC=gcc
+ CHMOD=chmod -x
+-JAVAC=javac
++JAVAC=javac -source 1.5 -target 1.5
+ 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 2011-09-09 20:47:52.000000000 +0100
+++ libusb-java-0.8+ztex20090101/debian/patches/series 2012-08-07 13:37:07.000000000 +0100
@@ -3,3 +3,4 @@
cflags.patch
introduceVersion.patch
doNotTreat64BitSpecialWithDebian.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-07-03 15:20:47.000000000 +0100
+++ libusb-java-0.8+ztex20090101/debian/rules 2012-08-07 13:40:37.000000000 +0100
@@ -18,7 +18,7 @@
dh_auto_build
jar cf libusb.jar `find ch -name "*.class"`
[ -d $(DOCPATH) ] || mkdir -p $(DOCPATH)
- javadoc -classpath . -d $(DOCPATH) ch.ntb.usb
+ javadoc -source 1.5 -classpath . -d $(DOCPATH) ch.ntb.usb
touch $@
LIBPACKAGE=libusb-java-lib
