[cup] 01/05: Add jflex-1.6.1.patch and fix FTBFS with the latest version of jflex.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository cup.

commit b83c625354c1385a67056ea53a3540bc1d6fcbb7
Author: Markus Koschany <apo at debian.org>
Date:   Wed Jul 27 12:06:09 2016 +0200

    Add jflex-1.6.1.patch and fix FTBFS with the latest version of jflex.
---
 debian/patches/build.diff        | 15 ++++++++++++---
 debian/patches/jflex-1.6.1.patch | 21 +++++++++++++++++++++
 debian/patches/series            |  1 +
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/debian/patches/build.diff b/debian/patches/build.diff
index 8137dea..5ddaacf 100644
--- a/debian/patches/build.diff
+++ b/debian/patches/build.diff
@@ -1,7 +1,16 @@
-Index: cup-0.11a+20060608/build.xml
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Wed, 27 Jul 2016 12:05:26 +0200
+Subject: build
+
 ===================================================================
---- cup-0.11a+20060608.orig/build.xml	2008-10-16 23:00:40.000000000 +0200
-+++ cup-0.11a+20060608/build.xml	2008-10-16 23:00:51.000000000 +0200
+---
+ build.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.xml b/build.xml
+index 705edd6..ae8138c 100644
+--- a/build.xml
++++ b/build.xml
 @@ -53,7 +53,7 @@
  
    <target name="compile" depends="jflex">
diff --git a/debian/patches/jflex-1.6.1.patch b/debian/patches/jflex-1.6.1.patch
new file mode 100644
index 0000000..f3a107e
--- /dev/null
+++ b/debian/patches/jflex-1.6.1.patch
@@ -0,0 +1,21 @@
+From: Markus Koschany <apo at debian.org>
+Date: Wed, 27 Jul 2016 12:05:46 +0200
+Subject: jflex 1.6.1
+
+---
+ build.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.xml b/build.xml
+index ae8138c..fbc2e0b 100644
+--- a/build.xml
++++ b/build.xml
+@@ -41,7 +41,7 @@
+   </target>
+ 
+   <taskdef name="cup" classname="java_cup.anttask.CUPTask" classpath="${bin}/java-cup-11.jar" />
+-  <taskdef name="jflex" classname="JFlex.anttask.JFlexTask" classpath="${bin}/JFlex.jar" />
++  <taskdef name="jflex" classname="jflex.anttask.JFlexTask" classpath="${bin}/JFlex.jar" />
+ 
+   <target name="cup" depends="init">
+     <cup srcfile="${cup}/parser.cup" interface="on" destdir="${java}" parser="parser" symbols="sym" quiet="false" nonterms="true"/>
diff --git a/debian/patches/series b/debian/patches/series
index c614a3c..e6da05d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 build.diff
+jflex-1.6.1.patch

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