Package: libusb-java
Version: 0.8+ztex20090101-6
Followup-For: Bug #728293
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
- d/p/jniInclude.patch: Restore original auto-detection of JAVAPREFIX so
that package continues to build on targets with default-java != openjdk-6.
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers trusty-updates
APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500,
'trusty'), (100, 'trusty-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.12.0-2-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru libusb-java-0.8+ztex20090101/debian/changelog libusb-java-0.8+ztex20090101/debian/changelog
diff -Nru libusb-java-0.8+ztex20090101/debian/patches/jniInclude.patch libusb-java-0.8+ztex20090101/debian/patches/jniInclude.patch
--- libusb-java-0.8+ztex20090101/debian/patches/jniInclude.patch 2012-09-16 20:37:40.000000000 +0100
+++ libusb-java-0.8+ztex20090101/debian/patches/jniInclude.patch 2013-10-08 23:13:04.000000000 +0100
@@ -1,14 +1,11 @@
-Index: libusb-java-0.8+ztex20090101/Makefile
-===================================================================
---- libusb-java-0.8+ztex20090101.orig/Makefile 2011-02-02 13:13:45.000000000 +0100
-+++ libusb-java-0.8+ztex20090101/Makefile 2012-09-16 20:45:06.000000000 +0200
-@@ -13,7 +13,8 @@
+--- a/Makefile
++++ b/Makefile
+@@ -13,7 +13,7 @@
#########################
# $(JAVAPREFIX)/include should contain jni.h
-JAVAPREFIX=/usr/local/java
-+#JAVAPREFIX=$(shell find /usr/lib/jvm/ -name jni.h | sed -e 's/include.*//' | head -n 1)
-+JAVAPREFIX=/usr/lib/jvm/java-6-openjdk-$(shell dpkg-architecture -qDEB_BUILD_ARCH|tr -d "\n")
++JAVAPREFIX=$(shell find /usr/lib/jvm/ -name jni.h | sed -e 's/include.*//' | head -n 1)
###############################
# this should not be modified #
