[Git][java-team/rxtx][master] 7 commits: Standards-Version updated to 4.1.4

Emmanuel Bourg gitlab at salsa.debian.org
Wed May 9 15:36:41 BST 2018 

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / rxtx


Commits:
6dd23ec8 by Emmanuel Bourg at 2018-05-09T15:11:02+02:00
Standards-Version updated to 4.1.4

- - - - -
e7cbead2 by Emmanuel Bourg at 2018-05-09T15:11:12+02:00
Switch to debhelper level 11

- - - - -
262f1f59 by Emmanuel Bourg at 2018-05-09T15:11:33+02:00
Use salsa.debian.org Vcs-* URLs

- - - - -
3907da7b by Emmanuel Bourg at 2018-05-09T15:19:37+02:00
Fixed the build failure with Java 10 (Closes: #897558)

- - - - -
b8f23b66 by Emmanuel Bourg at 2018-05-09T16:31:21+02:00
Fixed the NullPointerException with Java 10 caused by the null java.ext.dirs system property (Closes: #896929)

- - - - -
af896afb by Emmanuel Bourg at 2018-05-09T16:31:40+02:00
Improved the cleaning phase

- - - - -
6500bd55 by Emmanuel Bourg at 2018-05-09T16:34:28+02:00
Upload to unstable

- - - - -


8 changed files:

- debian/changelog
- debian/clean
- debian/compat
- debian/control
- + debian/patches/java10-compatibility.patch
- − debian/patches/java9.patch
- debian/patches/multiple_property_dirs.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+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 at apache.org>  Wed, 09 May 2018 16:34:13 +0200
+
 rxtx (2.2pre2+dfsg1-1) unstable; urgency=medium
 
   * Team upload.
@@ -46,7 +58,7 @@ rxtx (2.2pre2-11) unstable; urgency=low
   * debian/patches/MonitorThread-daemon.patch
     - Mark threads created by RXTX as daemon so JVM can shut down
       gracefully. Thanks to Christopher Wellons (Closes: #674975)
-  * debian/patches/fhs_lock_buffer_overflow_fix.patch 
+  * debian/patches/fhs_lock_buffer_overflow_fix.patch
     - Prevents java from failing with buffer overflow when a locked serial
       debice is opened. Thanks to Sergio Talens-Oliag (Closes: #673778)
 
@@ -80,7 +92,7 @@ rxtx (2.2pre2-8) UNRELEASED; urgency=low
 
 rxtx (2.2pre2-7) unstable; urgency=low
 
-  * Continued poritng effor: added --with autotools-dev 
+  * Continued poritng effor: added --with autotools-dev
     --with autoreconf to debian/rules
 
  -- Scott Howard <showard at debian.org>  Sun, 06 Feb 2011 12:56:21 -0500
@@ -110,9 +122,9 @@ rxtx (2.2pre2-4) experimental; urgency=low
       (Closes: #609152)
   * debian/patches/kreebsd_porting.patch
     - Fixed a FTBFS from not defining __FreeBSD_kernel__
-      (Closes: #585089) 
+      (Closes: #585089)
   * debian/patches/zsystem_exception.patch
-    - Print error if initialization fails (Closes: #472053) 
+    - Print error if initialization fails (Closes: #472053)
 
  -- Scott Howard <showard at debian.org>  Thu, 03 Feb 2011 21:05:47 -0500
 
@@ -215,7 +227,7 @@ rxtx (2.1.6-2) unstable; urgency=high
   * Fixed Build-Depends and Depends to include a real package (kaffe-dev,
     kaffe) in order to shut up lintian.
   * Thanks for all these changes to Hilko Bengen <bengen at debian.org>.
-  
+
  -- Mario Joussen <joussen at debian.org>  Sun, 17 Oct 2004 23:49:00 +0200
 
 rxtx (2.1.6-1) unstable; urgency=low


=====================================
debian/clean
=====================================
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1,2 @@
 *.m4
+api/


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,11 @@ Priority: optional
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Scott Howard <showard at debian.org>,
  tony mancill <tmancill at 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/java10-compatibility.patch
=====================================
--- /dev/null
+++ b/debian/patches/java10-compatibility.patch
@@ -0,0 +1,28 @@
+Description: Fixes the build failure with Java 10
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- 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)/*
+ 
+ #  install librxtxSerial.so into the proper directory and copy $(JARTARGET) to its
+--- a/configure.in
++++ b/configure.in
+@@ -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 -h \$(DEST)"
+ 		JAR="\$(JPATH)/bin/jar"
+ 		JAVADOC="\$(JPATH)/bin/javadoc"
+ 		CFLAGS=$CFLAGS" -D_BSD_SOURCE"


=====================================
debian/patches/java9.patch deleted
=====================================
--- a/debian/patches/java9.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Fri, 27 Oct 2017 13:48:51 +0200
-Subject: java9
-
-Bug-Debian: https://bugs.debian.org/873999
-Forwarded: no
----
- configure.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 1778a52..a1c7710 100644
---- 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
- 	*)
- 		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"
- 		JAR="\$(JPATH)/bin/jar"
- 		JAVADOC="\$(JPATH)/bin/javadoc"
- 		CFLAGS=$CFLAGS" -D_BSD_SOURCE"


=====================================
debian/patches/multiple_property_dirs.patch
=====================================
--- a/debian/patches/multiple_property_dirs.patch
+++ b/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
=====================================
--- a/debian/patches/series
+++ b/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



View it on GitLab: https://salsa.debian.org/java-team/rxtx/compare/f8d50e1b3a6885bbaf6e87da73c760cfb3c0a735...6500bd55f265de7d2dfef68dc1df5d8b990f66c3

---
View it on GitLab: https://salsa.debian.org/java-team/rxtx/compare/f8d50e1b3a6885bbaf6e87da73c760cfb3c0a735...6500bd55f265de7d2dfef68dc1df5d8b990f66c3
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/20180509/9fb8ac5b/attachment.html>

More information about the pkg-java-commits mailing list