[SCM] jinput - Java Game Controller API branch, master, updated. debian/20100502+dfsg-6-1-g581a9ed

[Niels Thykier]

The following commit has been merged in the master branch:
commit 581a9ed7ff060f37a3661318a15ed80ecd662bc2
Author: Niels Thykier <niels at thykier.net>
Date:   Thu Jun 21 14:20:33 2012 +0200

    Fix FTBFS with Java7
    
    Signed-off-by: Niels Thykier <niels at thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 01465b5..72d0f0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jinput (20100502+dfsg-7) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Patch a build.xml to include class-path for javahl call,
+    which was needed to fix FTBFS with Java7.
+
+ -- Niels Thykier <niels at thykier.net>  Thu, 21 Jun 2012 14:19:51 +0200
+
 jinput (20100502+dfsg-6) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/patches/05java7-compat.patch b/debian/patches/05java7-compat.patch
new file mode 100644
index 0000000..b4f8901
--- /dev/null
+++ b/debian/patches/05java7-compat.patch
@@ -0,0 +1,14 @@
+Description: Fix FTBFS with Java7
+
+diff --git a/plugins/linux/build.xml b/plugins/linux/build.xml
+index ad912f4..2848db3 100644
+--- a/plugins/linux/build.xml
++++ b/plugins/linux/build.xml
+@@ -56,6 +56,7 @@
+ 		<javah destdir="src/native">
+             <classpath>
+                 <pathelement location="classes"/>
++                <pathelement location="../../coreAPI/bin/jinput-core.jar"/>
+             </classpath>
+ 			<class name="net.java.games.input.LinuxEventDevice"/>
+ 			<class name="net.java.games.input.LinuxJoystickDevice"/>
diff --git a/debian/patches/series b/debian/patches/series
index b2ce8c6..4da57db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 02build.xml.nonfree
 03javadoc
 04jinput-remove-getDeviceUsageBits.patch
+05java7-compat.patch

-- 
jinput - Java Game Controller API