[javacc] 02/03: Clean generated source with clean target Build to javacc.jar instead of javacc-<version>.jar

[Benjamin Mesing]

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 04b83665e79671b78e45f4ca354466a3802bf4ea
Author: Benjamin Mesing <bensmail at gmx.net>
Date:   Thu Dec 8 21:09:43 2016 +0100

    Clean generated source with clean target
    Build to javacc.jar instead of javacc-<version>.jar
---
 debian/patches/build-fix.diff | 20 ++++++++++++++++++++
 debian/patches/series         |  1 +
 2 files changed, 21 insertions(+)

diff --git a/debian/patches/build-fix.diff b/debian/patches/build-fix.diff
new file mode 100644
index 0000000..2d081b8
--- /dev/null
+++ b/debian/patches/build-fix.diff
@@ -0,0 +1,20 @@
+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 8a32e2b..a49553f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 executables.diff
+build-fix.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/javacc.git