This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libcofoja-java.
commit ff34e28b47470450a3b5f1b643e976e1688903c5 Author: Emmanuel Bourg <[email protected]> Date: Tue Oct 4 11:16:44 2016 +0200 Replaced 01-remove-version-from-generated-jar.patch with a build parameter --- debian/changelog | 1 + .../01-remove-version-from-generated-jar.patch | 26 ---------------------- debian/patches/series | 1 - debian/rules | 1 + 4 files changed, 2 insertions(+), 27 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2a65933..0d3f757 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ cofoja (1.3-1) UNRELEASED; urgency=medium * Team upload. * New upstream release - Removed 02-java8-compatibility.patch (fixed upstream) + - Replaced 01-remove-version-from-generated-jar.patch with a build parameter * Standards-Version updated to 3.9.8 * Updated the Homepage field * Use secure Vcs-* URLs diff --git a/debian/patches/01-remove-version-from-generated-jar.patch b/debian/patches/01-remove-version-from-generated-jar.patch deleted file mode 100644 index fe07eae..0000000 --- a/debian/patches/01-remove-version-from-generated-jar.patch +++ /dev/null @@ -1,26 +0,0 @@ -Subject: remove version on jar -Description: generated jar containes version, - already added with javahelper -Author: Olivier Sallou <[email protected]> -Last-Updated: 2013-04-10 -Fowarded: no ---- a/build.xml -+++ b/build.xml -@@ -219,13 +219,13 @@ - <equals arg1="${snapshot}" arg2="true" /> - </condition> - <property name="cofoja.jar" -- value="${dist.dir}/cofoja+asm-${cofoja.version}.jar" /> -+ value="${dist.dir}/cofoja+asm.jar" /> - <property name="cofoja.bare.jar" -- value="${dist.dir}/cofoja-${cofoja.version}.jar" /> -+ value="${dist.dir}/cofoja.jar" /> - <property name="cofoja.contracted.jar" -- value="${dist.dir}/cofoja+contracts+asm-${cofoja.version}.jar" /> -+ value="${dist.dir}/cofoja+contracts+asm.jar" /> - <property name="cofoja.contracted.bare.jar" -- value="${dist.dir}/cofoja+contracts-${cofoja.version}.jar" /> -+ value="${dist.dir}/cofoja+contracts.jar" /> - - <mkdir dir="${obj.dir}" /> - <mkdir dir="${dist.dir}" /> diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 46d9b3c..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01-remove-version-from-generated-jar.patch diff --git a/debian/rules b/debian/rules index 3743231..93ce810 100755 --- a/debian/rules +++ b/debian/rules @@ -14,6 +14,7 @@ override_dh_gencontrol: override_dh_auto_build: # build unannotated cofoja library dh_auto_build -- -Dasm.jar=/usr/share/java/asm4-all.jar \ + -Dcofoja.bare.jar=dist/cofoja.jar \ -Djunit.jar=/usr/share/java/junit4.jar # rebuild using the library. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcofoja-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
