[Git][java-team/xz-java][master] 5 commits: Standards-Version updated to 4.1.4

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / xz-java


Commits:
a6d134be by Emmanuel Bourg at 2018-05-09T08:28:52+02:00
Standards-Version updated to 4.1.4

- - - - -
1182bfd8 by Emmanuel Bourg at 2018-05-09T08:28:57+02:00
Switch to debhelper level 11

- - - - -
5a9e31b5 by Emmanuel Bourg at 2018-05-09T08:29:02+02:00
Use salsa.debian.org Vcs-* URLs

- - - - -
022c7b7e by Emmanuel Bourg at 2018-05-09T09:27:51+02:00
Fixed the build failure with Java 10 (Closes: #898248)

- - - - -
cbce0752 by Emmanuel Bourg at 2018-05-09T09:28:17+02:00
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/compat
- debian/control
- + debian/patches/02-java10-compatibility.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xz-java (1.8-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Java 10 (Closes: #898248)
+  * 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 09:28:13 +0200
+
 xz-java (1.8-1) unstable; urgency=medium
 
   * Team upload.
@@ -67,7 +77,7 @@ xz-java (1.2-1) experimental; urgency=low
 xz-java (1.1-1) experimental; urgency=low
 
   [ Miguel Landaeta ]
-  * New upstream release. 
+  * New upstream release.
   * Fix issue with d/xz.pom and d/copyright. (Closes: #681712).
 
   [ tony mancill ]


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


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,14 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: ant,
-               debhelper (>= 10),
+               debhelper (>= 11),
                default-jdk,
                default-jdk-doc,
                javahelper,
                maven-repo-helper
-Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/xz-java.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/xz-java.git
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/xz-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/xz-java
 Homepage: http://tukaani.org/xz/java.html
 
 Package: libxz-java


=====================================
debian/patches/02-java10-compatibility.patch
=====================================
--- /dev/null
+++ b/debian/patches/02-java10-compatibility.patch
@@ -0,0 +1,20 @@
+Description: Fixes the build failure with Java 10
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -35,13 +35,11 @@
+             description="Generates HTML documentation with javadoc">
+         <mkdir dir="${doc_dir}"/>
+         <mkdir dir="${extdoc_dir}"/>
+-        <get src="${extdoc_url}/package-list"
+-             dest="${extdoc_dir}/package-list" skipexisting="true"/>
+         <javadoc sourcepath="${src_dir}" destdir="${doc_dir}"
+                  source="${sourcever}" packagenames="org.tukaani.xz"
+                  locale="en" additionalparam="-notimestamp"
+                  windowtitle="XZ data compression"
+-                 linkoffline="${extdoc_url} ${extdoc_dir}"/>
++                 link="${extdoc_url}"/>
+     </target>
+ 
+     <target name="compile" description="Compiles the classes">


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-reproducible-javadoc.patch
+02-java10-compatibility.patch


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,3 @@ override_dh_auto_build:
 
 override_dh_installchangelogs:
 	dh_installchangelogs -- NEWS
-
-get-orig-source:
-	cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \
-	uscan --rename --repack --compression xz --destdir $(CURDIR) --force-download



View it on GitLab: https://salsa.debian.org/java-team/xz-java/compare/8d51bbb342fd6fc6ffd2b40edb42678b510a1654...cbce07522d7c9c59a6ebeb7730edfabc1e10eba9

---
View it on GitLab: https://salsa.debian.org/java-team/xz-java/compare/8d51bbb342fd6fc6ffd2b40edb42678b510a1654...cbce07522d7c9c59a6ebeb7730edfabc1e10eba9
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/e57f7c7b/attachment.html>