[Git][java-team/jinput][master] 7 commits: Standards-Version updated to 4.1.4
Emmanuel Bourg
gitlab at salsa.debian.org
Tue May 8 22:55:13 BST 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jinput
Commits:
df9a6b16 by Emmanuel Bourg at 2018-05-08T23:25:03+02:00
Standards-Version updated to 4.1.4
- - - - -
32f863e4 by Emmanuel Bourg at 2018-05-08T23:25:24+02:00
Switch to debhelper level 11
- - - - -
fce60f57 by Emmanuel Bourg at 2018-05-08T23:25:53+02:00
Wrap and sort
- - - - -
59ab3d74 by Emmanuel Bourg at 2018-05-08T23:26:47+02:00
Use salsa.debian.org Vcs-* URLs
- - - - -
a6b9835c by Emmanuel Bourg at 2018-05-08T23:41:11+02:00
Fixed the build failure with Java 10 (Closes: #898225)
- - - - -
ff7dd7b0 by Emmanuel Bourg at 2018-05-08T23:53:22+02:00
Fixed the build failure on non linux kernels (Closes: #657771)
- - - - -
d923da13 by Emmanuel Bourg at 2018-05-08T23:53:33+02:00
Upload to unstable
- - - - -
8 changed files:
- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- − debian/patches/05java7-compat.patch
- + debian/patches/06java10-compat.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+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 at apache.org> Tue, 08 May 2018 23:53:28 +0200
+
jinput (20100502+dfsg-9) unstable; urgency=medium
* Upload to unstable
=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,27 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: tony mancill <tmancill at 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
=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Contact: David Biesack <djp at dev.java.net>,
- Jeremy Booth <endolf at dev.java.net>,
+ Jeremy Booth <endolf at dev.java.net>,
Jeff Kesselman <jeffpk at dev.java.net>,
Kenneth Russell <kbr at dev.java.net>,
Kevin Rushforth <kcr at dev.java.net>,
=====================================
debian/patches/05java7-compat.patch deleted
=====================================
--- a/debian/patches/05java7-compat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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"/>
=====================================
debian/patches/06java10-compat.patch
=====================================
--- /dev/null
+++ b/debian/patches/06java10-compat.patch
@@ -0,0 +1,83 @@
+Description: Fixes the compatibility with Java 10
+Author: Emmanuel Bourg <ebourg at 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>
+
+
=====================================
debian/patches/series
=====================================
--- 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
=====================================
debian/rules
=====================================
--- 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:
View it on GitLab: https://salsa.debian.org/java-team/jinput/compare/2f8f1e8a1440b651fff79682302e7454584c71f9...d923da132b1430d58c366aaedb2200fbcb47ab70
---
View it on GitLab: https://salsa.debian.org/java-team/jinput/compare/2f8f1e8a1440b651fff79682302e7454584c71f9...d923da132b1430d58c366aaedb2200fbcb47ab70
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180508/a1b5c2ff/attachment.html>
More information about the pkg-java-commits
mailing list