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 94d9d278319a250a7a5be336da20bea468285048 Author: Emmanuel Bourg <[email protected]> Date: Fri Apr 25 08:53:52 2014 +0000 Modified the detection of the JDK to build with Java 8 --- debian/changelog | 7 +++++++ debian/patches/02_java8_compatibility.patch | 18 ++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 26 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5ea3d31..5681d28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libjibx1.2-java (1.2.3-4) UNRELEASED; urgency=medium + + * Team upload. + * Modified the detection of the JDK to build with Java 8 + + -- Emmanuel Bourg <[email protected]> Fri, 25 Apr 2014 10:48:59 +0200 + libjibx1.2-java (1.2.3-3) unstable; urgency=low [ Stephen Nelson ] diff --git a/debian/patches/02_java8_compatibility.patch b/debian/patches/02_java8_compatibility.patch new file mode 100644 index 0000000..4a91ea9 --- /dev/null +++ b/debian/patches/02_java8_compatibility.patch @@ -0,0 +1,18 @@ +Description: Modifies the detection of the JDK to build with Java 8 +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/build/build.xml ++++ b/build/build.xml +@@ -49,11 +49,7 @@ + </not> + </condition> + <condition property="java5"> +- <or> +- <equals arg1="${ant.java.version}" arg2="1.5"/> +- <equals arg1="${ant.java.version}" arg2="1.6"/> +- <equals arg1="${ant.java.version}" arg2="1.7"/> +- </or> ++ <istrue value="true"/> + </condition> + + <!-- Common classpaths --> diff --git a/debian/patches/series b/debian/patches/series index f09dca4..732383f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ build_xml_clean_target.patch 01_build_xml.patch +02_java8_compatibility.patch -- 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
