debian/changelog

+rxtx (2.2pre2+dfsg1-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Java 10 (Closes: #897558)
+  * Fixed the NullPointerException with Java 10 caused by the null
+    java.ext.dirs system property (Closes: #896929)
+  * Standards-Version updated to 4.1.4
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 09 May 2018 16:34:13 +0200
+
 rxtx (2.2pre2+dfsg1-1) unstable; urgency=medium
 
   * Team upload.

debian/clean

 *.m4
+api/

debian/compat

-10
+11

debian/control

@@ -4,11 +4,11 @@ Priority: optional
 Maintainer: Debian Java maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Scott Howard <showard@debian.org>,
  tony mancill <tmancill@debian.org>
-Build-Depends: debhelper (>= 10), libtool, javahelper, default-jdk
-Standards-Version: 4.1.1
+Build-Depends: debhelper (>= 11), libtool, javahelper, default-jdk
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/rxtx.git
+Vcs-Browser: https://salsa.debian.org/java-team/rxtx
 Homepage: https://github.com/rxtx/rxtx
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/rxtx.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-java/rxtx.git
 
 Package: librxtx-java
 Architecture: any

debian/patches/java9.patch → debian/patches/java10-compatibility.patch

-From: Markus Koschany <apo@debian.org>
-Date: Fri, 27 Oct 2017 13:48:51 +0200
-Subject: java9
-
-Bug-Debian: https://bugs.debian.org/873999
+Description: Fixes the build failure with Java 10
+Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: no
----
- configure.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -111,11 +111,6 @@
+ $(CLASSES): $(javafiles) $(TOP)/Makefile
+ 	$(JAVAH_FIX)
+ 	$(JAVAC) $(javafiles)
+-	$(JAVAH) `(for i in $(javahfiles);do \
+-		if grep > /dev/null native.*\( $(SPATH)/gnu/io/$$i.java; then \
+-			echo $(CLASSDIR).$$i; \
+-		fi; \
+-	done)`
+ 	$(JAR) cf $(JARTARGET) $(CLASSTOP)/*
  
-diff --git a/configure.in b/configure.in
-index 1778a52..a1c7710 100644
+ #  install librxtxSerial.so into the proper directory and copy $(JARTARGET) to its
 --- a/configure.in
 +++ b/configure.in
-@@ -473,7 +473,7 @@ if test "$CC" = "gcc" || test "$CC"="egcs"; then
- 	Tran*)
- 		find_java_native_include jni.h
- 		JAVAH="\$(JPATH)/bin/kaffeh -classpath \$(CLASSPATH) -d \$(DEST) -jni"
--		JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.3 -target 1.3"
-+		JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.8 -target 1.8"
- 		JAR="\$(JPATH)/bin/jar"
- 		JAVADOC="\$(JPATH)/bin/javadoc -classpath \$(CLASSPATH)"
- 		CFLAGS=$CFLAGS" -D_BSD_SOURCE"
-@@ -485,7 +485,7 @@ if test "$CC" = "gcc" || test "$CC"="egcs"; then
+@@ -485,7 +485,7 @@
  	*)
  		find_java_native_include jni_md.h
  		JAVAH="\$(JPATH)/bin/javah -classpath \$(CLASSPATH) -d \$(DEST) -jni"
 -		JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.3 -target 1.3"
-+		JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.8 -target 1.8"
++		JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.8 -target 1.8 -h \$(DEST)"
  		JAR="\$(JPATH)/bin/jar"
  		JAVADOC="\$(JPATH)/bin/javadoc"
  		CFLAGS=$CFLAGS" -D_BSD_SOURCE"

debian/patches/multiple_property_dirs.patch

@@ -60,7 +60,7 @@ Index: rxtx/src/gnu/io/RXTXCommDriver.java
 -			    System.out.println("The file: gnu.io.rxtx.properties doesn't exists.");
 -			    System.out.println(e.toString());
 -			    }//end if
-+		String [] ext_dirs = System.getProperty("java.ext.dirs").split(":");
++		String [] ext_dirs = System.getProperty("java.ext.dirs") != null ? System.getProperty("java.ext.dirs").split(":") : new String[0];
 +		String fs = System.getProperty("file.separator");
 +		for (int n = 0; n < ext_dirs.length; ++n) {
 +			String ext_file = "?";

debian/patches/series

@@ -12,5 +12,5 @@ MonitorThread-daemon.patch
 usb_38400.patch
 fix_snprintf.patch
 format_security.patch
-java9.patch
 privacy-breach.patch
+java10-compatibility.patch