[sitemesh] 04/07: Fixed the compatibility with jflex 1.6 (Closes: #832809)

[Emmanuel Bourg]

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

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

commit 21a17f34541718ccd69d5be907640f6be7ce66e8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 29 09:22:27 2016 +0200

    Fixed the compatibility with jflex 1.6 (Closes: #832809)
---
 debian/changelog                           |  1 +
 debian/classpath-debian                    |  2 +-
 debian/control                             |  2 +-
 debian/patches/build_with_debian_jars.diff |  6 ++----
 debian/patches/update_lexer.diff           | 16 ++++++++++------
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 66b2140..392b846 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 sitemesh (2.4.1+dfsg-6) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed the compatibility with jflex 1.6 (Closes: #832809)
   * Standards-Version updated to 3.9.8
   * Use secure Vcs-* URLs
 
diff --git a/debian/classpath-debian b/debian/classpath-debian
index af18378..6b39043 100644
--- a/debian/classpath-debian
+++ b/debian/classpath-debian
@@ -1,4 +1,4 @@
-usr/share/java/JFlex.jar
+usr/share/java/jflex.jar
 usr/share/java/servlet-api-3.1.jar
 usr/share/java/jsp-api-2.3.jar
 usr/share/java/velocity-tools-view.jar
diff --git a/debian/control b/debian/control
index 864e088..3a91a90 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  default-jdk,
  default-jdk-doc,
  javahelper,
- jflex,
+ jflex (>= 1.6),
  junit,
  libfreemarker-java,
  libservlet3.1-java,
diff --git a/debian/patches/build_with_debian_jars.diff b/debian/patches/build_with_debian_jars.diff
index 078773c..4d4a0b7 100644
--- a/debian/patches/build_with_debian_jars.diff
+++ b/debian/patches/build_with_debian_jars.diff
@@ -3,8 +3,6 @@ Author: Miguel Landaeta <miguel at miguel.cc>
 Forwarded: no
 Last-Update: 2011-05-07
 
-diff --git a/build.xml b/build.xml
-index fb28188..70447f5 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -6,15 +6,13 @@
@@ -21,11 +19,11 @@ index fb28188..70447f5 100644
          <echo message="Generating HTML lexer using JFlex"/>
          <mkdir dir="build/java"/>
 -        <java classpath="lib/jflex.jar" classname="JFlex.Main" fork="yes">
-+        <java classpath="/usr/share/java/JFlex.jar" classname="JFlex.Main" fork="yes">
++        <java classpath="/usr/share/java/jflex.jar" classname="jflex.Main" fork="yes">
              <arg value="-d"/>
              <arg value="build/java/com/opensymphony/module/sitemesh/html/tokenizer"/>
              <arg value="src/java/com/opensymphony/module/sitemesh/html/tokenizer/lexer.flex"/>
-@@ -153,11 +151,13 @@
+@@ -155,11 +153,13 @@
              <lib dir="dist">
                  <include name="${name}-${version}.jar"/>
              </lib>
diff --git a/debian/patches/update_lexer.diff b/debian/patches/update_lexer.diff
index 93c8143..91c67ec 100644
--- a/debian/patches/update_lexer.diff
+++ b/debian/patches/update_lexer.diff
@@ -1,13 +1,17 @@
-Description: Compatibility with JFlex 1.4.x
+Description: Compatibility with JFlex 1.6.x
 Author: Miguel Landaeta <miguel at miguel.cc>
 Forwarded: no
-Last-Update: 2011-05-07
-
-diff --git a/src/java/com/opensymphony/module/sitemesh/html/tokenizer/lexer.flex b/src/java/com/opensymphony/module/sitemesh/html/tokenizer/lexer.flex
-index 8803fee..1ac608a 100644
 --- a/src/java/com/opensymphony/module/sitemesh/html/tokenizer/lexer.flex
 +++ b/src/java/com/opensymphony/module/sitemesh/html/tokenizer/lexer.flex
-@@ -29,7 +29,7 @@ package com.opensymphony.module.sitemesh.html.tokenizer;
+@@ -21,15 +21,13 @@
+ //%line
+ //%column
+ 
+-// Profiling showed that this mode was slightly faster than %pack or %table.
+-%switch
+ // Profiling showed this as an optimal size buffer that was often filled but rarely exceeded.
+ %buffer 2048
+ 
  %{
      // Additional methods to add to generated Lexer to aid in error reporting.
      protected int position() { return yychar; }

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