[Git][java-team/jets3t][master] 6 commits: Standards-Version updated to 4.1.4

[Emmanuel Bourg]

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


Commits:
278e3b69 by Emmanuel Bourg at 2018-06-07T10:07:45+02:00
Standards-Version updated to 4.1.4

- - - - -
aab75587 by Emmanuel Bourg at 2018-06-07T10:09:04+02:00
Switch to debhelper level 11

- - - - -
24100b1c by Emmanuel Bourg at 2018-06-07T10:09:04+02:00
Use salsa.debian.org Vcs-* URLs

- - - - -
58cab40f by Emmanuel Bourg at 2018-06-07T10:14:16+02:00
Use secure URLs

- - - - -
fcd045ae by Emmanuel Bourg at 2018-06-07T10:40:18+02:00
Set the source encoding to fix the build failure with recent JDKs (Closes: #893198)

- - - - -
cc21e736 by Emmanuel Bourg at 2018-06-07T10:48:39+02:00
Upload to unstable

- - - - -


8 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- + debian/patches/11_source_encoding.diff
- debian/patches/series
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,21 @@
-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 at 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 at apache.org>  Thu, 07 Jun 2018 10:48:32 +0200
 
 jets3t (0.8.1+dfsg-3) unstable; urgency=medium
 


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


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at 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
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: JetS3t
 Upstream-Contact: James Murty <jmurty at 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 at dev.java.net>


=====================================
debian/patches/11_source_encoding.diff
=====================================
--- /dev/null
+++ b/debian/patches/11_source_encoding.diff
@@ -0,0 +1,13 @@
+Description: Sets the source encoding to fix the build failure with recent JDKs
+Author: Emmanuel Bourg <ebourg at 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
=====================================
--- a/debian/patches/series
+++ b/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
=====================================
--- a/debian/rules
+++ b/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
=====================================
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 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



View it on GitLab: https://salsa.debian.org/java-team/jets3t/compare/ae8ed9f1d2b71bb979b97b8f4ffa6d0b2c55ff57...cc21e73695f8af23173e214535baeb7bd809c1aa

-- 
View it on GitLab: https://salsa.debian.org/java-team/jets3t/compare/ae8ed9f1d2b71bb979b97b8f4ffa6d0b2c55ff57...cc21e73695f8af23173e214535baeb7bd809c1aa
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/20180607/f6e0e185/attachment.html>