This is an automated email from the git hooks/post-receive script. ben pushed a commit to branch debian_6_1_3 in repository javacc.
commit 2230c567ff1e562ab38c377f80743b5d6b62277a Author: Benjamin Mesing <[email protected]> Date: Fri Dec 9 20:26:06 2016 +0100 Pass -Djavacc-jarname=javacc.jar and provided custom clean target instead of patching build.xml --- debian/patches/build-fix.diff | 20 -------------------- debian/patches/series | 1 - debian/rules | 7 +++++-- 3 files changed, 5 insertions(+), 23 deletions(-) diff --git a/debian/patches/build-fix.diff b/debian/patches/build-fix.diff deleted file mode 100644 index 2d081b8..0000000 --- a/debian/patches/build-fix.diff +++ /dev/null @@ -1,20 +0,0 @@ -Index: javacc/build.xml -=================================================================== ---- javacc.orig/build.xml -+++ javacc/build.xml -@@ -41,13 +41,13 @@ THE POSSIBILITY OF SUCH DAMAGE. - <property name="generated-sources-src" value="src/main/generated-sources" /> - <property name="test-tmp" value="test.tmp" /> - <property name="target-folder" value="target" /> -- <property name="javacc-jarname" value="javacc-${version.major}.${version.minor}.${version.patch}.jar" /> -+ <property name="javacc-jarname" value="javacc.jar" /> - <property name="javacc-jar" value="${target-folder}/${javacc-jarname}" /> - <property name="bootstrap-jar" value="bootstrap/javacc.jar" /> - <property name="jjtree-bootstrap-class" value="org.javacc.jjtree.Main" /> - <property name="javacc-bootstrap-class" value="org.javacc.parser.Main" /> - -- <target name="clean"> -+ <target name="clean" depends="clean_generated_sources"> - <delete dir="classes" /> - <delete dir="${target-folder}" /> - <delete dir="test.tmp" /> diff --git a/debian/patches/series b/debian/patches/series index a49553f..8a32e2b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ executables.diff -build-fix.diff diff --git a/debian/rules b/debian/rules index b8f7975..8a8e036 100755 --- a/debian/rules +++ b/debian/rules @@ -6,11 +6,14 @@ VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p') dh $@ --with maven-repo-helper override_dh_auto_build: - dh_auto_build -- jar + dh_auto_build -- -Djavacc-jarname=javacc.jar jar docbook-to-man debian/manpage.sgml >bin/javacc.1 +override_dh_auto_clean: + dh_auto_build -- -Djavacc-jarname=javacc.jar clean clean_generated_sources + override_dh_auto_test: - dh_auto_build -- unittest + dh_auto_build -- -Djavacc-jarname=javacc.jar unittest get-orig-source: uscan --download-current-version --force-download --rename --repack --compression xz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/javacc.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
