[Git][java-team/libjibx1.2-java][master] 5 commits: Use https for Format field. Remove trailing whitespace.

Fri May 11 20:08:41 BST 2018

Markus Koschany pushed to branch master at Debian Java Maintainers / libjibx1.2-java


Commits:
28036d70 by Markus Koschany at 2018-05-11T18:40:54+02:00
Use https for Format field. Remove trailing whitespace.

- - - - -
99399aac by Markus Koschany at 2018-05-11T18:41:13+02:00
Declare compliance with Debian Policy 4.1.4.

- - - - -
fe35a9a5 by Markus Koschany at 2018-05-11T21:02:35+02:00
Fix FTBFS with Java 9.

Closes: #893259

- - - - -
c05b7c08 by Markus Koschany at 2018-05-11T21:02:59+02:00
Remove trailing whitespace.

- - - - -
fee1d09d by Markus Koschany at 2018-05-11T21:04:47+02:00
Update changelog

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/java10.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libjibx1.2-java (1.2.6-2) unstable; urgency=medium
+
+  * Team upload.
+  * Declare compliance with Debian Policy 4.1.4.
+  * Fix FTBFS with Java 9. (Closes: #893259)
+
+ -- Markus Koschany <apo at debian.org>  Fri, 11 May 2018 21:04:18 +0200
+
 libjibx1.2-java (1.2.6-1) unstable; urgency=medium
 
   * Team upload
@@ -27,8 +35,8 @@ libjibx1.2-java (1.2.3-3) unstable; urgency=low
   [ Stephen Nelson ]
   * Team upload.
   * Update standards version to 3.9.5
-  * Remove Michael Koch from uploaders. (Closes: #654082) 
-  * Add Stephen Nelson to uploaders. 
+  * Remove Michael Koch from uploaders. (Closes: #654082)
+  * Add Stephen Nelson to uploaders.
   * Update the Vcs fields.
   * Use debhelper version 9.
   * Provide Maven artifact. (Closes: #729021)


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends-Indep: libbcel-java,
                      libjoda-time-java,
                      liblog4j1.2-java,
                      libxpp3-java
-Standards-Version: 3.9.7
+Standards-Version: 4.1.4
 Vcs-Git: git://anonscm.debian.org/pkg-java/libjibx-java.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libjibx-java.git
 Homepage: http://jibx.sf.net


=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: jibx 
-Upstream-Contact: Dennis M. Sosnoski <dsosnoski at users.sourceforge.net> 
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: jibx
+Upstream-Contact: Dennis M. Sosnoski <dsosnoski at users.sourceforge.net>
 Source: http://sourceforge.net/projects/jibx/
 
 Files: *


=====================================
debian/patches/java10.patch
=====================================
--- /dev/null
+++ b/debian/patches/java10.patch
@@ -0,0 +1,43 @@
+From: Markus Koschany <apo at debian.org>
+Date: Fri, 11 May 2018 20:55:47 +0200
+Subject: java10
+
+Ignore the error at build time. Hopefully there are no runtime issues..
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=893259
+Forwarded: no
+---
+ build/build.xml | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/build/build.xml b/build/build.xml
+index 4ebfb29..734bef1 100644
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -205,7 +205,7 @@ file has been tested with ant version 1.6.1.
+         <path refid="support-classpath"/>
+       </classpath>
+     </javac>
+-    <java classname="org.jibx.binding.Compile" fork="yes" failonerror="true">
++    <java classname="org.jibx.binding.Compile" fork="yes" failonerror="false">
+       <!-- This command line argument should only be used when binding JiBX.
+         It skips the step of validating the binding using the binding definition
+         model (because the model itself uses JiBX binding, which can create
+@@ -242,7 +242,7 @@ file has been tested with ant version 1.6.1.
+         <fileset dir="/usr/share/java" includes="log4j-1.2.jar" />
+       </classpath>
+     </javac>
+-    <java classname="org.jibx.binding.Compile" fork="yes" failonerror="true">
++    <java classname="org.jibx.binding.Compile" fork="yes" failonerror="false">
+       <classpath>
+         <pathelement path="${schemadest}"/>
+         <fileset dir="${lib}" includes="*.jar" excludes="asm*.jar,org.eclipse.*.jar,qdox*.jar,${schemaname}.jar,${toolsname}.jar"/>
+@@ -270,7 +270,7 @@ file has been tested with ant version 1.6.1.
+         <fileset dir="${lib}" includes="*.jar" excludes="asm*.jar,${toolsname}.jar"/>
+       </classpath>
+     </javac>
+-    <java classname="org.jibx.binding.Compile" fork="yes" failonerror="true">
++    <java classname="org.jibx.binding.Compile" fork="yes" failonerror="false">
+       <classpath>
+         <pathelement path="${toolsdest}"/>
+         <fileset dir="${lib}" includes="*.jar" excludes="asm*.jar,${toolsname}.jar"/>


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 build_xml_clean_target.patch
 01_build_xml.patch
 02_java8_compatibility.patch
+java10.patch


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ DEB_INSTALL_CHANGELOGS_ALL := changes.txt
 DEB_UPSTREAM_VERSION_2 := $(shell echo $(DEB_UPSTREAM_VERSION) | cut -f1,2 -d. )
 
 clean::
-	mh_clean 
+	mh_clean
 	-rm -fr build/api build/classes lib/*
 
 install/libjibx1.2-java::



View it on GitLab: https://salsa.debian.org/java-team/libjibx1.2-java/compare/f919873a3bb6c6608391bcdaf30610cced8eb25c...fee1d09dd78e6f87e6ba9a70c1db174137237c4a

---
View it on GitLab: https://salsa.debian.org/java-team/libjibx1.2-java/compare/f919873a3bb6c6608391bcdaf30610cced8eb25c...fee1d09dd78e6f87e6ba9a70c1db174137237c4a
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/20180511/ef4363b5/attachment.html>
