debian/changelog

-jets3t (0.8.1+dfsg-4) UNRELEASED; urgency=medium
+jets3t (0.8.1+dfsg-4) unstable; urgency=medium
 
   * Team upload.
+
+  [ Miguel Landaeta ]
   * Remove myself from uploaders. (Closes: #871869)
   * Bump DH compat level to 10.
   * Update copyright info.
   * Simplify d/rules.
 
- -- Miguel Landaeta <nomadium@debian.org>  Tue, 08 Aug 2017 19:49:09 +0100
+  [ Emmanuel Bourg ]
+  * Set the source encoding to fix the build failure with recent JDKs
+    (Closes: #893198)
+  * Standards-Version updated to 4.1.4
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Thu, 07 Jun 2018 10:48:32 +0200
 
 jets3t (0.8.1+dfsg-3) unstable; urgency=medium
 

debian/compat

-10
+11

debian/control

@@ -3,7 +3,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.or
 Section: java
 Priority: optional
 Build-Depends: ant,
-               debhelper (>= 10~),
+               debhelper (>= 11~),
                default-jdk,
                default-jdk-doc,
                javahelper,
@@ -16,10 +16,10 @@ Build-Depends: ant,
                libservlet3.1-java,
                maven-repo-helper,
                perl
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/jets3t.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jets3t.git
-Homepage: http://jets3t.s3.amazonaws.com/index.html
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/jets3t.git
+Vcs-Browser: https://salsa.debian.org/java-team/jets3t
+Homepage: https://jets3t.s3.amazonaws.com/index.html
 
 Package: jets3t
 Architecture: all

debian/copyright

 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: JetS3t
 Upstream-Contact: James Murty <jmurty@dev.java.net>
-Source: http://jets3t.s3.amazonaws.com/downloads.html
+Source: https://jets3t.s3.amazonaws.com/downloads.html
 
 Files: *
 Copyright: 2006-2010, James Murty <jmurty@dev.java.net>

debian/patches/11_source_encoding.diff

+Description: Sets the source encoding to fix the build failure with recent JDKs
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -100,6 +100,7 @@
+ 			srcdir="${dir.src}"
+ 			destdir="${dir.build}"
+ 			debug="${debug}"
++			encoding="UTF-8"
+ 			source="${build.source}"
+ 			target="${build.target}">
+ 			<classpath refid="classpath"/>

debian/patches/series

@@ -7,3 +7,4 @@
 08_generate_javadoc.diff
 09_rename_app_jars.diff
 10_java15.diff
+11_source_encoding.diff

debian/rules

@@ -32,15 +32,6 @@ override_dh_auto_clean:
 	dh_auto_clean
 	mh_clean
 
-get-orig-source:
-	cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \
-	uscan \
-		--verbose \
-		--no-symlink \
-		--destdir $(CURDIR)      \
-		--watchfile debian/watch \
-		--force-download
-
 get-orig-pom:
 	mkdir -p debian/poms
 	wget -O debian/poms/jets3t.pom -U NoAgent-1.0 \

debian/watch

 version=3
 opts=dversionmangle=s/\+dfsg// \
-http://jets3t.s3.amazonaws.com/downloads.html \
-http://bitbucket.org/jmurty/jets3t/downloads/jets3t-([\d\.]+).zip debian debian/orig-tar.sh
+https://jets3t.s3.amazonaws.com/downloads.html \
+https://bitbucket.org/jmurty/jets3t/downloads/jets3t-([\d\.]+).zip debian debian/orig-tar.sh