Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg
--- a/debian/changelog
+++ b/debian/changelog
+jinput (20100502+dfsg-10) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Java 10 (Closes: #898225)
+  * Fixed the build failure on non linux kernels (Closes: #657771)
+  * Standards-Version updated to 4.1.4
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Tue, 08 May 2018 23:53:28 +0200
+
 jinput (20100502+dfsg-9) unstable; urgency=medium

  * Upload to unstable

--- a/debian/compat
+++ b/debian/compat
-10
+11
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,27 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: tony mancill <tmancill@debian.org>
-Build-Depends: debhelper (>= 10), javahelper (>= 0.29), ant, ant-optional,
- default-jdk, libjutils-java
-Build-Depends-Indep: default-jdk-doc
-Standards-Version: 4.0.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/jinput.git/
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jinput.git/
+Build-Depends:
+ ant,
+ ant-optional,
+ debhelper (>= 11),
+ default-jdk,
+ javahelper (>= 0.29),
+ libjutils-java
+Build-Depends-Indep:
+ default-jdk-doc
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/jinput.git
+Vcs-Browser: https://salsa.debian.org/java-team/jinput
 Homepage: https://java.net/projects/jinput

 Package: libjinput-java
 Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}, libjinput-jni (>= ${source:Version}),
- libjutils-java
+Depends:
+ libjinput-jni (>= ${source:Version}),
+ libjutils-java,
+ ${java:Depends},
+ ${misc:Depends}
 Description: Java Game Controller API
 jinput is an implementation of an API for game controller discovery and
 polled input. It is part of a suite of open-source technologies initiated by
@@ -27,7 +36,9 @@ Description: Java Game Controller API

 Package: libjinput-jni
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Java Game Controller API (jni)
 jinput is an implementation of an API for game controller discovery and
 polled input. It is part of a suite of open-source technologies initiated by
@@ -43,9 +54,13 @@ Description: Java Game Controller API (jni)
 Package: libjinput-java-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
-Suggests: libjinput-java
-Recommends: default-jdk-doc, libjutils-java-doc
+Depends:
+ ${misc:Depends}
+Suggests:
+ libjinput-java
+Recommends:
+ default-jdk-doc,
+ libjutils-java-doc
 Description: Java Game Controller API (javadoc)
 jinput is an implementation of an API for game controller discovery and
 polled input. It is part of a suite of open-source technologies initiated by

--- a/debian/copyright
+++ b/debian/copyright
--- a/debian/patches/05java7-compat.patch
+++ b/debian/patches/05java7-compat.patch
-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"/>
--- a/debian/patches/06java10-compat.patch
+++ b/debian/patches/06java10-compat.patch
+Description: Fixes the compatibility with Java 10
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/plugins/linux/build.xml
+++ b/plugins/linux/build.xml
+@@ -12,7 +12,7 @@
+ 
+     <target depends="init" name="compile">
+ 		<!--		<ant dir="src/native" target="createNativeDefinitions.java"/>-->
+-        <javac debug="true" deprecation="true" destdir="classes" source="1.4" target="1.4" srcdir="src/java">
+        <javac debug="true" deprecation="true" destdir="classes" source="1.4" target="1.4" srcdir="src/java" nativeHeaderDir="src/native">
+             <classpath>
+ 				<pathelement location="../../coreAPI/bin/jinput-core.jar"/>
+                 <pathelement location="../../lib/jutils.jar"/>
+@@ -53,13 +53,6 @@
+     </target>
+ 
+     <target depends="init,compile" name="createJNIHeaders">
+-		<javah destdir="src/native">
+-            <classpath>
+-                <pathelement location="classes"/>
+-            </classpath>
+-			<class name="net.java.games.input.LinuxEventDevice"/>
+-			<class name="net.java.games.input.LinuxJoystickDevice"/>
+-		</javah>
+     </target>
+     
+     <target depends="init,createJNIHeaders" name="compileNativeJinputLib" if="linux">
+--- a/plugins/wintab/build.xml
+++ b/plugins/wintab/build.xml
+@@ -9,7 +9,7 @@
+     </target>
+ 
+     <target name="compile" depends="init">
+-        <javac srcdir="../windows/src/java" destdir="classes" debug="true" deprecation="true" source="1.4" target="1.4">
+        <javac srcdir="../windows/src/java" destdir="classes" debug="true" deprecation="true" source="1.4" target="1.4" nativeHeaderDir="src/native">
+         	<include name="**/DummyWindow.java"/>
+ 		</javac>
+ 
+@@ -23,16 +23,6 @@
+ 	</target>
+ 
+     <target depends="init,compile" name="create_jniheaders">
+-		<javah destdir="src/native">
+-            <classpath>
+-                <pathelement path="classes"/>
+-                <pathelement location="../../coreAPI/classes"/>
+-            </classpath>
+-			<class name="net.java.games.input.DummyWindow"/>
+-			<class name="net.java.games.input.WinTabContext"/>
+-			<class name="net.java.games.input.WinTabDevice"/>
+-			<class name="net.java.games.input.WinTabComponent"/>
+-		</javah>
+ 	</target>
+ 
+     <target name="compile_native" depends="init,create_jniheaders" if="wintab">
+--- a/plugins/OSX/build.xml
+++ b/plugins/OSX/build.xml
+@@ -18,7 +18,7 @@
+     </target>
+ 
+     <target depends="init" name="compile">
+-        <javac debug="true" deprecation="true" destdir="${build}" source="1.4" srcdir="src/java">
+        <javac debug="true" deprecation="true" destdir="${build}" source="1.4" srcdir="src/java" nativeHeaderDir="src/native">
+             <classpath>
+                 <pathelement location="../../coreAPI/bin/jinput-core.jar"/>
+                 <pathelement location="../../lib/jutils.jar"/>
+@@ -59,15 +59,6 @@
+     </target>
+ 
+     <target depends="init,compile" name="createJNIHeaders">
+-        <javah destdir="src/native">
+-            <classpath>
+-                <pathelement path="${build}"/>
+-                <pathelement location="../../coreAPI/classes"/>
+-            </classpath>
+-			<class name="net.java.games.input.OSXHIDDeviceIterator"/>
+-			<class name="net.java.games.input.OSXHIDDevice"/>
+-			<class name="net.java.games.input.OSXHIDQueue"/>
+-        </javah>
+     </target>
+ 
+ 	
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,4 @@
 02build.xml.nonfree
 03javadoc
 04jinput-remove-getDeviceUsageBits.patch
-05java7-compat.patch
+06java10-compat.patch
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ export CLASSPATH

 override_dh_auto_build:
 	mkdir lib && cp /usr/share/java/jutils.jar lib
-	ant simple_linux
+	ant simple_linux -Dlinux=true
 	ant -f coreAPI/build.xml javadoc

 override_dh_auto_install: