[cup] 01/01: Fixed the parsing of grammar files with DOS line endings (Closes: #834671)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository cup.

commit 9831260a66f2ccac3a1ce49816be385dc1cb5c8d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Aug 23 11:15:08 2016 +0200

    Fixed the parsing of grammar files with DOS line endings (Closes: #834671)
---
 debian/changelog                 |  7 +++++++
 debian/patches/jflex-1.6.1.patch | 23 ++++++++++++-----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 51b94c5..95f1b23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cup (0.11a+20060608-8) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the parsing of grammar files with DOS line endings (Closes: #834671)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 23 Aug 2016 11:05:04 +0200
+
 cup (0.11a+20060608-7) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/jflex-1.6.1.patch b/debian/patches/jflex-1.6.1.patch
index f3a107e..d48dc15 100644
--- a/debian/patches/jflex-1.6.1.patch
+++ b/debian/patches/jflex-1.6.1.patch
@@ -1,16 +1,9 @@
-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
+Description: Fixes the compatibility with the version of JFlex in Debian
+Author: Markus Koschany <apo at debian.org>, Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
 --- a/build.xml
 +++ b/build.xml
-@@ -41,7 +41,7 @@
+@@ -41,14 +41,14 @@
    </target>
  
    <taskdef name="cup" classname="java_cup.anttask.CUPTask" classpath="${bin}/java-cup-11.jar" />
@@ -19,3 +12,11 @@ index ae8138c..fbc2e0b 100644
  
    <target name="cup" depends="init">
      <cup srcfile="${cup}/parser.cup" interface="on" destdir="${java}" parser="parser" symbols="sym" quiet="false" nonterms="true"/>
+   </target>
+ 
+   <target name="jflex" depends="cup">
+-    <jflex file="${flex}/Lexer.jflex" destdir="${java}" />
++    <jflex file="${flex}/Lexer.jflex" destdir="${java}" legacydot="on"/>
+   </target>
+ 
+   <target name="compile" depends="jflex">

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