[Git][java-team/jftp][master] 5 commits: Fixed the build failure with Java 11 (Closes: #912458)

[Emmanuel Bourg]

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


Commits:
a02db174 by Emmanuel Bourg at 2018-11-02T13:47:31Z
Fixed the build failure with Java 11 (Closes: #912458)

- - - - -
0d2fc2d7 by Emmanuel Bourg at 2018-11-02T13:48:12Z
Standards-Version updated to 4.2.1

- - - - -
eece33c8 by Emmanuel Bourg at 2018-11-02T13:48:29Z
Switch to debhelper level 11

- - - - -
dfaf7499 by Emmanuel Bourg at 2018-11-02T13:48:35Z
Use salsa.debian.org Vcs-* URLs

- - - - -
305abf2d by Emmanuel Bourg at 2018-11-02T13:49:01Z
Upload to unstable

- - - - -


7 changed files:

- debian/changelog
- debian/compat
- debian/control
- + debian/patches/01-java1-compatibility.patch
- debian/patches/series
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+jftp (1.60+dfsg-3) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Java 11 (Closes: #912458)
+  * Standards-Version updated to 4.2.1
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 02 Nov 2018 14:48:53 +0100
+
 jftp (1.60+dfsg-2) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-9
+11


=====================================
debian/control
=====================================
@@ -6,7 +6,7 @@ Uploaders:
  Varun Hiremath <varun at debian.org>
 Build-Depends:
  ant,
- debhelper (>= 9),
+ debhelper (>= 11),
  default-jdk,
  javahelper,
  kunststoff,
@@ -20,9 +20,9 @@ Build-Depends:
  libmiglayout-java,
  libswt-gtk-4-java,
  libyanfs-java
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/jftp.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jftp.git
+Standards-Version: 4.2.1
+Vcs-Git: https://salsa.debian.org/java-team/jftp.git
+Vcs-Browser: https://salsa.debian.org/java-team/jftp
 Homepage: http://j-ftp.sourceforge.net
 
 Package: jftp


=====================================
debian/patches/01-java1-compatibility.patch
=====================================
@@ -0,0 +1,14 @@
+Description: Fixes the compatibility with Java 11
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/java/net/sf/jftp/util/JReciever.java
++++ b/src/java/net/sf/jftp/util/JReciever.java
+@@ -92,7 +92,7 @@
+ 
+     public void reset(DataInputStream in)
+     {
+-        reciever.destroy();
++        reciever.interrupt();
+         this.in = in;
+         reciever = new Thread(this);
+         reciever.start();


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
+01-java1-compatibility.patch
 webdav-disable.patch
 JWebBroser-disable.patch


=====================================
debian/rules
=====================================
@@ -4,7 +4,7 @@ export JAVA_TOOL_OPTIONS=-Dfile.encoding=iso-8859-1
 export CLASSPATH=/usr/share/java/jcifs.jar:/usr/share/java/jl.jar:/usr/share/java/commons-logging.jar:/usr/share/java/log4j-1.2.jar:/usr/share/java/kunststoff.jar:/usr/share/java/j2ssh-ant.jar:/usr/share/java/j2ssh-core.jar:/usr/share/java/yanfs.jar:/usr/share/java/j2ssh-common.jar:/usr/share/java/j2ssh-daemon.jar:/usr/share/java/jsch.jar:/usr/share/java/miglayout.jar:/usr/share/java/swt4.jar:/usr/share/java/commons-codec.jar
 
 %:
-	dh $@ --parallel --with javahelper
+	dh $@ --with javahelper
 
 override_dh_auto_build:
 	mkdir -p lib
@@ -12,6 +12,3 @@ override_dh_auto_build:
 		-Dant.build.javac.source=1.6 \
 		-Dant.build.javac.target=1.6 \
 		jars
-
-get-orig-source:
-	uscan --download-current-version --force-download --compression xz --repack


=====================================
debian/watch
=====================================
@@ -1,3 +1,3 @@
 version=3
-opts="dversionmangle=s/\+dfsg*//" \
+opts="repack,compression=xz,dversionmangle=s/\+dfsg*//" \
 http://sf.net/j-ftp/j-ftp-([\d.]+)\.tar\.gz



View it on GitLab: https://salsa.debian.org/java-team/jftp/compare/b8359c42e0e1e90e7184b5ddd0e306f6d9506fba...305abf2dfcede8ce70437ac9323b3df8011bf659

-- 
View it on GitLab: https://salsa.debian.org/java-team/jftp/compare/b8359c42e0e1e90e7184b5ddd0e306f6d9506fba...305abf2dfcede8ce70437ac9323b3df8011bf659
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/20181102/3d48d522/attachment.html>