This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libjibx1.2-java.
commit 54c6b6b5d6aaf2f5c1b7f1b70e09daf6952b8e85 Author: Emmanuel Bourg <[email protected]> Date: Tue Feb 2 10:45:56 2016 +0100 Refreshed the patches --- debian/changelog | 5 ++++- debian/patches/01_build_xml.patch | 14 ++++++-------- debian/patches/02_java8_compatibility.patch | 5 +++-- debian/patches/build_xml_clean_target.patch | 8 +++----- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 828beca..2c71c42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ -libjibx1.2-java (1.2.3-5) UNRELEASED; urgency=medium +libjibx1.2-java (1.2.6-1) UNRELEASED; urgency=medium + * Team upload + * New upstream release + - Refreshed the patches * Moved the package to Git * Use XZ compression for the upstream tarball * Standards-Version updated to 3.9.7 (no changes) diff --git a/debian/patches/01_build_xml.patch b/debian/patches/01_build_xml.patch index 14b7003..a35cad3 100644 --- a/debian/patches/01_build_xml.patch +++ b/debian/patches/01_build_xml.patch @@ -1,8 +1,6 @@ -Index: libjibx1.2-java-1.2.3/build/build.xml -=================================================================== ---- libjibx1.2-java-1.2.3.orig/build/build.xml 2011-08-31 14:05:45.000000000 +0200 -+++ libjibx1.2-java-1.2.3/build/build.xml 2011-08-31 14:05:54.000000000 +0200 -@@ -59,6 +59,7 @@ +--- a/build/build.xml ++++ b/build/build.xml +@@ -60,6 +60,7 @@ <!-- Common classpaths --> <path id="support-classpath"> <fileset dir="${lib}" includes="*.jar" excludes="asm*.jar,org.eclipse.*.jar,qdox*.jar,jibx*.jar"/> @@ -10,7 +8,7 @@ Index: libjibx1.2-java-1.2.3/build/build.xml </path> <!-- Optional components --> -@@ -242,12 +243,14 @@ +@@ -243,12 +244,14 @@ deprecation="on"> <classpath> <fileset dir="${lib}" includes="*.jar" excludes="asm*.jar,org.eclipse.*.jar,qdox*.jar,${schemaname}.jar,${toolsname}.jar"/> @@ -25,7 +23,7 @@ Index: libjibx1.2-java-1.2.3/build/build.xml </classpath> <arg value="${src}/schema-noprefix-binding.xml"/> <arg value="${src}/schema-xsprefix-binding.xml"/> -@@ -1273,6 +1276,7 @@ +@@ -1274,6 +1277,7 @@ <bottom><table width='80%%'><tr><td width='50%%'><p align='center'><a href='http://www.jibx.org/' target='_top'><font size='3'><b>Project Web Site</b></font></a></td><td width='50%%'><p align='center'></td></tr></table></bottom> <classpath> <fileset dir="${lib}" includes="*.jar"/> @@ -33,7 +31,7 @@ Index: libjibx1.2-java-1.2.3/build/build.xml </classpath> </javadoc> </target> -@@ -1411,7 +1415,7 @@ +@@ -1412,7 +1416,7 @@ <!-- Intermediate targets, not to be run directly. --> <target name="build-jibx" depends="compile-run,compile-bind,compile-extras"/> diff --git a/debian/patches/02_java8_compatibility.patch b/debian/patches/02_java8_compatibility.patch index 4a91ea9..6dc7433 100644 --- a/debian/patches/02_java8_compatibility.patch +++ b/debian/patches/02_java8_compatibility.patch @@ -1,9 +1,9 @@ -Description: Modifies the detection of the JDK to build with Java 8 +Description: Modifies the detection of the JDK to build with any JDK Author: Emmanuel Bourg <[email protected]> Forwarded: no --- a/build/build.xml +++ b/build/build.xml -@@ -49,11 +49,7 @@ +@@ -49,12 +49,7 @@ </not> </condition> <condition property="java5"> @@ -11,6 +11,7 @@ Forwarded: no - <equals arg1="${ant.java.version}" arg2="1.5"/> - <equals arg1="${ant.java.version}" arg2="1.6"/> - <equals arg1="${ant.java.version}" arg2="1.7"/> +- <equals arg1="${ant.java.version}" arg2="1.8"/> - </or> + <istrue value="true"/> </condition> diff --git a/debian/patches/build_xml_clean_target.patch b/debian/patches/build_xml_clean_target.patch index 75e575f..c1a5c64 100644 --- a/debian/patches/build_xml_clean_target.patch +++ b/debian/patches/build_xml_clean_target.patch @@ -1,8 +1,6 @@ -Index: libjibx1.2-java-1.2.3/build/build.xml -=================================================================== ---- libjibx1.2-java-1.2.3.orig/build/build.xml 2011-02-14 20:35:24.000000000 +0100 -+++ libjibx1.2-java-1.2.3/build/build.xml 2011-08-31 14:05:45.000000000 +0200 -@@ -65,6 +65,11 @@ +--- a/build/build.xml ++++ b/build/build.xml +@@ -66,6 +66,11 @@ <available property="dom4j" file="${lib}/dom4j.jar"/> <available property="jdom" file="${lib}/jdom.jar"/> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjibx1.2-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
