[jflex] 33/33: Imported Debian patch 1.6.1-1

Markus Koschany apo at moszumanska.debian.org
Wed Jul 27 10:45:13 UTC 2016


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

apo pushed a commit to branch master
in repository jflex.

commit 50e2ef02db061c670a06fc38bf5ba13fc5cba676
Merge: 1aa360d 37b166d
Author: Markus Koschany <apo at debian.org>
Date:   Wed Jul 27 06:48:48 2016 +0200

    Imported Debian patch 1.6.1-1

 ._changelog.md                                     |   Bin 0 -> 247 bytes
 COPYRIGHT                                          |   300 +-
 README.md                                          |    45 +
 bin/jflex                                          |    20 +-
 bin/jflex.bat                                      |    26 +-
 build.xml                                          |   142 +
 src/changelog => changelog.md                      |   112 +-
 debian/changelog                                   |    28 +-
 debian/control                                     |     7 +-
 debian/copyright                                   |    77 +-
 debian/dirs                                        |     3 -
 debian/doc-base                                    |     3 -
 debian/docs                                        |     1 -
 debian/install                                     |     1 +
 debian/jflex.1                                     |     2 +-
 debian/jflex.links                                 |     2 +-
 debian/jflex.poms                                  |     2 +-
 debian/logo.gif                                    |   Bin 31753 -> 0 bytes
 debian/patches/01_build_xml.patch                  |    11 -
 debian/patches/02_build_xml_jar.patch              |    10 -
 debian/patches/02_example_url_fix.patch            |    12 -
 debian/patches/03_build_xml_target.patch           |    13 -
 debian/patches/03_script_cp_fix.patch              |    13 -
 debian/patches/04_remove_timestamps.patch          |    23 -
 debian/patches/LexScan.flex.patch                  |    24 +
 debian/patches/build.patch                         |    44 +
 debian/patches/jflex-executable.patch              |    21 +
 debian/patches/series                              |     9 +-
 debian/pom.xml                                     |    57 -
 debian/rules                                       |    17 +-
 debian/source/include-binaries                     |     1 -
 debian/watch                                       |     5 +-
 doc/._manual.pdf                                   |   Bin 0 -> 177 bytes
 doc/COPYRIGHT                                      |   300 +-
 doc/crossref.png                                   |   Bin 146 -> 0 bytes
 doc/footnote.png                                   |   Bin 189 -> 190 bytes
 doc/jflex-black.png                                |   Bin 0 -> 3607 bytes
 doc/jflex_anttask.html                             |    37 +-
 doc/logo.gif                                       |   Bin 31753 -> 0 bytes
 doc/manual.html                                    |  1856 ++-
 doc/manual.pdf                                     |   Bin 626888 -> 300100 bytes
 doc/manual.ps.gz                                   |   Bin 264948 -> 0 bytes
 examples/binary/Makefile                           |    22 -
 examples/binary/README                             |    18 -
 examples/binary/StraightStreamReader.java          |   287 -
 examples/binary/binary.flex                        |    52 -
 examples/byaccj/Makefile                           |     2 +-
 examples/byaccj/calc.flex                          |    13 +-
 examples/byaccj/calc.y                             |    13 +-
 examples/cup/Makefile                              |    10 +-
 examples/cup/ycalc.cup                             |    12 +-
 examples/interpreter/AST.java                      |    13 +-
 examples/interpreter/Main.java                     |    13 +-
 examples/interpreter/Makefile                      |    22 +-
 examples/interpreter/README                        |     5 +-
 examples/interpreter/STEfun.java                   |    13 +-
 examples/interpreter/STEvar.java                   |    13 +-
 examples/interpreter/SymTab.java                   |    44 +-
 examples/interpreter/SymtabEntry.java              |    13 +-
 examples/interpreter/Tboolexp.java                 |    13 +-
 examples/interpreter/Tdekl.java                    |    13 +-
 examples/interpreter/Tdekllist.java                |    13 +-
 examples/interpreter/Texp.java                     |    13 +-
 examples/interpreter/Texpinfix.java                |    13 +-
 examples/interpreter/Texplist.java                 |    13 +-
 examples/interpreter/Tfun.java                     |    13 +-
 examples/interpreter/Tident.java                   |    13 +-
 examples/interpreter/Tifthenelse.java              |    13 +-
 examples/interpreter/Tnumber.java                  |    13 +-
 examples/interpreter/Tparlist.java                 |    13 +-
 examples/interpreter/Tprogram.java                 |    13 +-
 examples/interpreter/Tuminus.java                  |    13 +-
 examples/interpreter/build.xml                     |     6 +-
 examples/interpreter/output.good                   |    14 +
 examples/interpreter/parser.cup                    |    13 +-
 examples/interpreter/scanner.flex                  |    13 +-
 examples/java/JavaParser.java                      |    15 +-
 examples/java/Makefile                             |    14 +-
 examples/java/README                               |     5 +-
 examples/java/TestLexer.java                       |    15 +-
 examples/java/build.xml                            |     6 +-
 examples/java/java.flex                            |    45 +-
 examples/java/java12.cup                           |     5 +-
 examples/java/lexer-output.good                    |   768 +-
 examples/java/unicode.flex                         |    22 +-
 examples/pom.xml                                   |    23 +-
 examples/simple-maven/README.txt                   |   100 -
 examples/simple-maven/pom.xml                      |     3 +-
 examples/simple-maven/src/README                   |     2 +-
 examples/simple-maven/src/main/jflex/simple.flex   |     4 +-
 examples/simple-maven/src/site/apt/usage.apt       |    10 +-
 .../simple-maven/src/test/resources/output.good    |   153 +-
 examples/simple/Makefile                           |    23 -
 examples/simple/README                             |    29 -
 examples/simple/Utility.java                       |    19 -
 examples/simple/Yytoken.java                       |    24 -
 examples/simple/output.good                        |   660 --
 examples/simple/test.txt                           |    19 -
 examples/standalone-maven/pom.xml                  |     4 +-
 .../src/main/jflex/standalone.flex                 |    15 +-
 examples/standalone/Makefile                       |    13 -
 examples/standalone/README                         |    20 -
 examples/standalone/build.xml                      |    23 -
 examples/standalone/sample.inp                     |     8 -
 examples/standalone/standalone.flex                |    44 -
 examples/zero-reader/FunkyReader.java              |    46 +
 examples/zero-reader/Makefile                      |    30 +
 examples/zero-reader/README.md                     |    55 +
 examples/zero-reader/ZeroReader.java               |    85 +
 examples/zero-reader/lexer-output.good             |    65 +
 examples/zero-reader/test-input.txt                |     4 +
 examples/zero-reader/zero-lexer.jflex              |    88 +
 lib/jflex-mode.el                                  |     3 -
 lib/jflex.vim                                      |     3 -
 parent.xml                                         |   226 +
 pom.xml                                            |   343 +
 src/JFlex/CharClassException.java                  |    49 -
 src/JFlex/EOFActions.java                          |    94 -
 src/JFlex/GeneratorException.java                  |    36 -
 src/JFlex/IntCharSet.java                          |   411 -
 src/JFlex/IntPair.java                             |    57 -
 src/JFlex/Interval.java                            |   163 -
 src/JFlex/LexParse.cup                             |   648 --
 src/JFlex/LexParse.java                            |  1794 ---
 src/JFlex/LexScan.java                             |  3012 -----
 src/JFlex/LexicalStates.java                       |    97 -
 src/JFlex/MacroException.java                      |    49 -
 src/JFlex/RegExp2.java                             |    50 -
 src/JFlex/SilentExit.java                          |    31 -
 src/JFlex/gui/GridPanelConstraint.java             |    44 -
 src/JFlex/gui/Handles.java                         |    49 -
 src/JFlex/sym.java                                 |    61 -
 src/JFlex/tests/AllTests.java                      |    50 -
 src/JFlex/tests/EmitterTest.java                   |    50 -
 src/JFlex/tests/SkeletonTest.java                  |    63 -
 src/README                                         |    46 -
 src/build.xml                                      |   114 -
 src/main/config/pmd/ruleset.xml                    |    26 +
 src/main/cup/LexParse.cup                          |  1193 ++
 .../java_cup/runtime/ComplexSymbolFactory.java     |     0
 .../java_cup/runtime/DefaultSymbolFactory.java     |     0
 src/{ => main/java}/java_cup/runtime/Scanner.java  |     0
 src/{ => main/java}/java_cup/runtime/Symbol.java   |     0
 .../java}/java_cup/runtime/SymbolFactory.java      |     0
 .../java}/java_cup/runtime/lr_parser.java          |    48 +-
 .../java_cup/runtime/virtual_parse_stack.java      |    10 +-
 src/{JFlex => main/java/jflex}/Action.java         |    21 +-
 src/main/java/jflex/CharClassException.java        |    44 +
 .../java/jflex}/CharClassInterval.java             |    21 +-
 src/{JFlex => main/java/jflex}/CharClasses.java    |   184 +-
 src/{JFlex => main/java/jflex}/CharSet.java        |    27 +-
 .../java/jflex}/CharSetEnumerator.java             |    21 +-
 src/{JFlex => main/java/jflex}/CountEmitter.java   |    23 +-
 src/{JFlex => main/java/jflex}/DFA.java            |    63 +-
 src/main/java/jflex/EOFActions.java                |    79 +
 src/{JFlex => main/java/jflex}/Emitter.java        |   643 +-
 src/{JFlex => main/java/jflex}/ErrorMessages.java  |    34 +-
 src/main/java/jflex/GeneratorException.java        |    30 +
 src/{JFlex => main/java/jflex}/HiLowEmitter.java   |    23 +-
 src/main/java/jflex/IntCharSet.java                |   397 +
 src/main/java/jflex/IntPair.java                   |    46 +
 src/main/java/jflex/Interval.java                  |   152 +
 src/main/java/jflex/LexicalStates.java             |    86 +
 src/main/java/jflex/MacroException.java            |    44 +
 src/{JFlex => main/java/jflex}/Macros.java         |    62 +-
 src/{JFlex => main/java/jflex}/Main.java           |   189 +-
 src/{JFlex => main/java/jflex}/NFA.java            |   189 +-
 src/{JFlex => main/java/jflex}/Options.java        |    58 +-
 src/{JFlex => main/java/jflex}/Out.java            |    64 +-
 src/{JFlex => main/java/jflex}/PackEmitter.java    |    31 +-
 src/{JFlex => main/java/jflex}/RegExp.java         |    37 +-
 src/{JFlex => main/java/jflex}/RegExp1.java        |    25 +-
 src/main/java/jflex/RegExp2.java                   |    39 +
 src/{JFlex => main/java/jflex}/RegExps.java        |   124 +-
 .../java/jflex}/ScannerException.java              |    25 +-
 src/{JFlex => main/java/jflex}/SemCheck.java       |    45 +-
 src/main/java/jflex/SilentExit.java                |    25 +
 src/{JFlex => main/java/jflex}/Skeleton.java       |    40 +-
 src/{JFlex => main/java/jflex}/StatePairList.java  |    21 +-
 src/{JFlex => main/java/jflex}/StateSet.java       |    31 +-
 .../java/jflex}/StateSetEnumerator.java            |    21 +-
 src/{JFlex => main/java/jflex}/StdOutWriter.java   |    21 +-
 src/{JFlex => main/java/jflex}/Timer.java          |    21 +-
 .../java/jflex}/anttask/JFlexTask.java             |    97 +-
 .../java/jflex}/gui/GeneratorThread.java           |    24 +-
 src/{JFlex => main/java/jflex}/gui/GridPanel.java  |    31 +-
 src/main/java/jflex/gui/GridPanelConstraint.java   |    33 +
 src/main/java/jflex/gui/Handles.java               |    38 +
 src/{JFlex => main/java/jflex}/gui/MainFrame.java  |    42 +-
 .../java/jflex}/gui/OptionsDialog.java             |   152 +-
 src/main/java/jflex/unicode/UnicodeProperties.java |   296 +
 src/main/java/jflex/unicode/data/Unicode_1_1.java  |   933 ++
 src/main/java/jflex/unicode/data/Unicode_2_0.java  |  1938 ++++
 src/main/java/jflex/unicode/data/Unicode_2_1.java  |  2067 ++++
 src/main/java/jflex/unicode/data/Unicode_3_0.java  |  3009 +++++
 src/main/java/jflex/unicode/data/Unicode_3_1.java  |  3367 ++++++
 src/main/java/jflex/unicode/data/Unicode_3_2.java  |  4001 +++++++
 src/main/java/jflex/unicode/data/Unicode_4_0.java  |  4414 ++++++++
 src/main/java/jflex/unicode/data/Unicode_4_1.java  |  6109 ++++++++++
 src/main/java/jflex/unicode/data/Unicode_5_0.java  |  6397 +++++++++++
 src/main/java/jflex/unicode/data/Unicode_5_1.java  |  7138 ++++++++++++
 src/main/java/jflex/unicode/data/Unicode_5_2.java  |  8411 ++++++++++++++
 src/main/java/jflex/unicode/data/Unicode_6_0.java  |  9255 +++++++++++++++
 src/main/java/jflex/unicode/data/Unicode_6_1.java  | 10024 ++++++++++++++++
 src/main/java/jflex/unicode/data/Unicode_6_2.java  | 10185 +++++++++++++++++
 src/main/java/jflex/unicode/data/Unicode_6_3.java  | 10344 +++++++++++++++++
 src/main/java/jflex/unicode/data/Unicode_7_0.java  | 11308 +++++++++++++++++++
 src/main/jflex/LexScan.flex                        |   742 ++
 src/{ => main/jflex}/skeleton.nested               |   116 +-
 .../jflex/skeleton.nested-1.6.0}                   |    97 +-
 .../resources/jflex}/Messages.properties           |   158 +-
 src/{ => main/resources/jflex}/skeleton.default    |    77 +-
 src/manifest                                       |     1 -
 .../tests => test/java/jflex}/AntTaskTests.java    |    92 +-
 .../tests => test/java/jflex}/CharClassesTest.java |    46 +-
 src/test/java/jflex/EmitterTest.java               |    81 +
 src/test/java/jflex/IntCharSetTest.java            |    23 +
 .../tests => test/java/jflex}/PackEmitterTest.java |    23 +-
 .../tests => test/java/jflex}/RegExpTests.java     |    30 +-
 src/test/java/jflex/SkeletonTest.java              |    51 +
 src/test/java/jflex/UnicodePropertiesTest.java     |   374 +
 src/test/resources/jflex/._LexScan-test.flex       |   Bin 0 -> 250 bytes
 .../resources/jflex/LexScan-test.flex}             |   216 +-
 .../test/resources/jflex}/simple.flex              |     0
 224 files changed, 107171 insertions(+), 12863 deletions(-)

diff --cc debian/changelog
index ccb5bad,0000000..ce05179
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,186 -1,0 +1,202 @@@
- jflex (1.4.3+dfsg-2.1) UNRELEASED; urgency=medium
- 
-   * Non-maintainer upload.
-   * Moved the package to Git
- 
-  -- Markus Koschany <apo at debian.org>  Wed, 27 Jul 2016 12:36:51 +0200
++jflex (1.6.1-1) unstable; urgency=medium
++
++  * Imported Upstream version 1.6.1
++  * Update watch file. The project moved to Github.
++  * Add get-orig-source target.
++  * Update jflex.poms and use upstream's pom.xml file.
++  * Move the package to Git.
++  * Add myself to Uploaders. (Closes: #831816)
++  * Remove debian/logo.gif because it is no longer needed for the docs.
++  * Drop all patches because they are either obsolete or applied upstream.
++  * Add build.patch and jflex-executable.patch to adjust build system and
++    wrapper script for Debian.
++  * Build-Depend on jflex and cup.
++  * Add LexScan.flex.patch to fix FTBFS with the older version of JFlex.
++  * Drop dirs file and remove dh_install override. Use install file instead.
++  * Install changelog.md as upstream changelog.
++  * Update debian/copyright to copyright format 1.0.
++  * Depend on default-jre | java6-runtime because jflex requires a X11
++    environment. Compile the source code for Java 6 from now on which is de
++    facto already the minimum requirement in Debian.
++
++ -- Markus Koschany <apo at debian.org>  Wed, 27 Jul 2016 06:48:48 +0200
 +
 +jflex (1.4.3+dfsg-2) unstable; urgency=medium
 +
 +  * Team upload.
 +
 +  [ Sylvestre Ledru ]
 +  * Remove myself from the uploaders
 +
 +  [ Emmanuel Bourg ]
 +  * Removed the timestamps from the generated files to improve
 +    the reproducibility of the reverse dependencies
 +  * Standards-Version updated to 3.9.8 (no changes)
 +  * Updated debian/watch to track the latest releases
 +
 + -- Emmanuel Bourg <ebourg at apache.org>  Tue, 03 May 2016 14:10:45 +0200
 +
 +jflex (1.4.3+dfsg-1) unstable; urgency=medium
 +
 +  * Team upload.
 +  * wrap-and-sort -sa.
 +  * Use compat level 9 and require debhelper >= 9.
 +  * Declare compliance with Debian Policy 3.9.7.
 +  * Use only Build-Depends field.
 +  * Switch from cdbs to dh sequencer.
 +  * Use maven-repo-helper to install maven artifacts.
 +  * Add jflex.poms and pom.xml.
 +  * Remove Niels Thykier from Uploaders. (Closes: #770563)
 +  * Use canonical Vcs-URI.
 +  * Repack the tarball and remove pre-built JFlex.jar file.
 +
 + -- Markus Koschany <apo at debian.org>  Fri, 12 Feb 2016 18:12:32 +0100
 +
 +jflex (1.4.3-3) unstable; urgency=low
 +
 +  * Upload in unstable
 +  * Update Standards-Version to version 3.9.4
 +
 + -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 06 May 2013 09:27:25 +0200
 +
 +jflex (1.4.3-3~exp1) experimental; urgency=low
 +
 +  * Update Standards-Version to version 3.9.3
 +  * Add myself among the uploaders
 +
 + -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 07 Apr 2013 19:19:39 +0200
 +
 +jflex (1.4.3-2) unstable; urgency=low
 +
 +  * Team upload.
 +  * Remove Arnaud and Paul from Uploaders list.
 +  * Switch to source format 3.0. Use dpkg's internal quilt instead of cdbs'
 +    simple patchsys.
 +  * Install file debian/logo.gif instead of the corrupt doc/logo.gif.
 +    (Closes: #578875)
 +
 + -- Torsten Werner <twerner at debian.org>  Sat, 06 Aug 2011 18:55:47 +0200
 +
 +jflex (1.4.3-1) unstable; urgency=low
 +
 +  * New upstream (bug fix) release
 +  * Fixed dangling symlink in usr/share/ant/lib (Closes: #538063)
 +  * Bumped Standards-versions to 3.8.2 - no changes required.
 +  * Bumped to debhelper version 7.
 +  * Fixed spelling errors.
 +  * Corrected section to java.
 +  * Corrected some paths in debian/rules and debian/docs.
 +
 + -- Niels Thykier <niels at thykier.net>  Thu, 23 Jul 2009 21:07:58 +0200
 +
 +jflex (1.4.2-2) unstable; urgency=low
 +
 +  * debian/copyright: Update, mention GPL v2 explicitly.
 +
 + -- Matthias Klose <doko at debian.org>  Fri, 30 Jan 2009 12:07:57 +0100
 +
 +jflex (1.4.2-1) unstable; urgency=low
 +
 +  [Matthias Klose]
 +  * New upstream (bug fix) release.
 +  * Build-depend on default-jdk, depend on default-jre-headless.
 +  * debian/patches/03_build_xml_target.patch: Update.
 +
 +  [Paul Cager]
 +  * Added watch file.
 +  * Added symlink from ant's lib directory
 +    (Closes: #388371 - JFlexTask cannot be found).
 +  * debian/control:
 +    + Removed Wolfgang Baer from uploaders and added myself.
 +    + Add Homepage field.
 +    + Add Vcs-Svn and Vcs-Browser.
 +    + Build-Depends-Indep on java-gcj-compat-dev instead of kaffe.
 +    + Updated Standards-Version to 3.8.0.
 +    + Moved cdbs and debhelper to Build-Depends.
 +  * debian/copyright
 +    + Removed lintian warnings about file format.
 +
 + -- Matthias Klose <doko at ubuntu.com>  Fri, 09 Jan 2009 11:20:59 +0100
 +
 +jflex (1.4.1-3) unstable; urgency=low
 +
 +  * added myself as an uploader.
 +  * removed Takashi Okamoto from the uploaders (closes: #352980).
 +
 + -- Arnaud Vandyck <avdyk at debian.org>  Thu,  9 Mar 2006 21:36:42 +0000
 +
 +jflex (1.4.1-2) unstable; urgency=low
 +
 +  * kaffe compiler transition
 +    + Removed build compiler jikes setting
 +    + Added patch to raise target to 1.3 (needed by ecj)
 +
 + -- Wolfgang Baer <WBaer at gmx.de>  Mon, 16 Jan 2006 11:37:07 +0100
 +
 +jflex (1.4.1-1) unstable; urgency=low
 +
 +  * New upstream release (closes: #248259)
 +  * Transferred maintainership to pkg-java maintainers
 +  * Changed build system to use ant, cdbs
 +  * Added a compat file
 +  * Changed dependency to comply with debian java policy (closes: #237823)
 +  * Removed jflex, cup dependency and patch build file to 
 +    use the included pregenerated files to avoid dep on itself
 +  * Register documentation with doc-base
 +  * Fixed outdated URL in examples/byaccj (closes: #306528)
 +  * Extracted all patches from diff.gz into debian/patches
 +  * Wrote a simple manpage for jflex
 +  * Standards-Version 3.6.2 (no changes)
 +
 + -- Wolfgang Baer <WBaer at gmx.de>  Thu,  6 Oct 2005 20:34:44 +0200
 +
 +jflex (1.3.5-7) unstable; urgency=low
 +
 +  * fixed type in control file. (closes: #215478)
 +
 + -- Takashi Okamoto <tora at debian.org>  Tue, 14 Oct 2003 00:41:58 +0900
 +
 +jflex (1.3.5-6) unstable; urgency=low
 +
 +  * fixed FTBFS (closes: #201450)
 +
 + -- Takashi Okamoto <tora at debian.org>  Sun, 31 Aug 2003 19:31:54 +0900
 +
 +jflex (1.3.5-5) unstable; urgency=low
 +
 +  * fixed FTBFS (closes: #166595)
 +
 + -- Takashi Okamoto <tora at debian.org>  Sun, 31 Aug 2003 19:31:46 +0900
 +
 +jflex (1.3.5-4) unstable; urgency=low
 +
 +  * fixed not compile with kaffe. (Closes:#141250)
 +
 + -- Takashi Okamoto <tora at debian.org>  Sat, 27 Jul 2002 08:12:09 +0900
 +
 +jflex (1.3.5-3) unstable; urgency=low
 +
 +  * add jflex at Build-Depend. (Closes:#133719)
 +
 + -- Takashi Okamoto <tora at debian.org>  Sat, 16 Feb 2002 13:38:21 +0900
 +
 +jflex (1.3.5-2) unstable; urgency=low
 +
 +  * change Build-Depends to Build-Depends-Indep.
 +  * change /usr/share/java/JFlex.jar to /usr/share/java/JFlex-1.3.5.jar.
 +    new JFlex.jar is symbolic link in JFlex-1.3.5.jar .
 +
 + -- Takashi Okamoto <tora at debian.org>  Thu, 17 Jan 2002 17:07:32 +0900
 +
 +jflex (1.3.5-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Takashi Okamoto <tora at debian.org>  Sat, 12 Jan 2002 03:29:35 +0900
 +
 +jflex (1.3.2-1) unstable; urgency=low
 +
 +  * Initial release.
 +
 + -- Takashi Okamoto <tora at debian.org>  Sat,  2 Jun 2001 19:17:32 +0900
 +
diff --cc debian/control
index 4acb518,0000000..d0d0b3a
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,32 -1,0 +1,35 @@@
 +Source: jflex
 +Section: java
 +Priority: optional
 +Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 +Uploaders:
++ Markus Koschany <apo at debian.org>
 +Build-Depends:
 + ant,
++ cup,
 + debhelper (>= 9),
 + default-jdk,
++ jflex,
 + junit,
 + maven-repo-helper
 +Standards-Version: 3.9.8
 +Vcs-Git: https://anonscm.debian.org/git/pkg-java/jflex.git
- Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/jflex
++Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jflex.git
 +Homepage: http://www.jflex.de/
 +
 +Package: jflex
 +Architecture: all
 +Depends:
-  default-jre-headless | java1-runtime | java2-runtime,
++ default-jre | java6-runtime,
 + ${misc:Depends}
 +Enhances:
 + ant-optional
 +Description: lexical analyzer generator for Java
 + It is also a rewrite of the very useful tool JLex which was developed
 + by Elliot Berk at Princeton University. As Vern Paxon states for
 + his C/C++ tool flex : They do not share any code though.
 + .
 + JFlex is designed to work together with the LALR parser generator CUP
 + by Scott Hudson, and the Java modification of Berkeley Yacc BYacc/J
 + by Bob Jamison. It can also be used together with other parser generators
 + like ANTLR or as a standalone tool.
diff --cc debian/copyright
index 67e5280,0000000..627e072
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,34 -1,0 +1,43 @@@
- This package was debianized by Takashi Okamoto tora at debian.org on
- Sat,  2 Jun 2001 19:17:32 +0900.
- 
- It was downloaded from <http://www.jflex.de>
- 
- Authors:
-     Gerwin Klein <lsf at jflex.de>
-     David MacMahon <davidm at smartsc.com>
-     Frank Flannery
-     Rafal Mantiuk <Rafal.Mantiuk at bellstream.pl>
-     Bernhard Rumpe <rumpe at in.tum.de>
- 
- Copyright:
-     Copyright (c) 1998 - 2008 Gerwin Klein, David MacMahon,
-                               Frank Flannery Rafal Mantiuk, Bernhard Rumpe,
-                               Stephen Ostermiller.
- 
- License:
-     JFlex - Copying, Warranty & License
- 
-     JFlex is free software, published under the terms of the GNU General
-     Public License v2.
- 
-     There is absolutely NO WARRANTY for JFlex, its code and its documentation.
- 
-     The code generated by JFlex inherits the copyright of the specification it
-     was produced from. If it was your specification, you may use the generated
-     code without restriction.
- 
-     The following file(s) are licensed under the GPL v2 or later:
-       src/JFlex/gui/GridPanelConstraint.java
- 
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: jflex
++Source: https://github.com/jflex-de/jflex
++Files-Excluded:
++ *.jar
++
++
++Files: *
++Copyright: Gerwin Klein, Steve Rowe, Regis Decamp.
++License: BSD-3-clause
++
++Files: debian/*
++Copyright: 2001-2003, Takashi Okamoto <tora at debian.org>
++           2005-2006, Wolfgang Baer <WBaer at gmx.de>
++           2006,      Arnaud Vandyck <avdyk at debian.org>
++           2009,      Matthias Klose <doko at ubuntu.com>
++           2009,      Niels Thykier <niels at thykier.net>
++           2011,      Torsten Werner <twerner at debian.org>
++           2013,      Sylvestre Ledru <sylvestre at debian.org>
++           2016,      Emmanuel Bourg <ebourg at apache.org>
++           2016,      Markus Koschany <apo at debian.org>
++License: BSD-3-clause
++
++License: BSD-3-clause
++ All rights reserved.
++ .
++ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
++ .
++    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
++    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
++    * Neither the names of the authors nor the names of JFlex contributors may be used to endorse or promote products derived from this software without specific prior written permission.
++ .
++ .
++ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
++ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
++ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
++ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
++ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
++ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --cc debian/doc-base
index 39724bb,0000000..93d0be9
mode 100644,000000..100644
--- a/debian/doc-base
+++ b/debian/doc-base
@@@ -1,15 -1,0 +1,12 @@@
 +Document: jflex
 +Title: Manual for JFlex
 +Author: Gerwin Klein
 +Abstract: Manual of JFlex, a lexical analyzer generator for Java.
 +Section: Programming
 +
 +Format: HTML
 +Index: /usr/share/doc/jflex/manual.html
 +Files: /usr/share/doc/jflex/*.html
 +
- Format: PostScript
- Files: /usr/share/doc/jflex/manual.ps.gz
- 
 +Format: PDF
 +Files: /usr/share/doc/jflex/manual.pdf.gz
diff --cc debian/docs
index 41e09c8,0000000..b45595b
mode 100644,000000..100644
--- a/debian/docs
+++ b/debian/docs
@@@ -1,5 -1,0 +1,4 @@@
- debian/logo.gif
 +doc/*.png
 +doc/jflex_anttask.html
 +doc/manual*
 +examples
diff --cc debian/install
index 0000000,0000000..f559fd9
new file mode 100644
--- /dev/null
+++ b/debian/install
@@@ -1,0 -1,0 +1,1 @@@
++bin/jflex usr/bin
diff --cc debian/jflex.1
index be025d3,0000000..449b81c
mode 100644,000000..100644
--- a/debian/jflex.1
+++ b/debian/jflex.1
@@@ -1,57 -1,0 +1,57 @@@
 +.TH JFLEX "1" "October 2005"
 +.SH NAME
 +jflex \- a lexical analyzer generator (also known as scanner generator) for Java
 +.SH SYNOPSIS
 +.B jflex
 +\fI<options> <input-files>\fR
 +.SH DESCRIPTION
- JFlex is a lexical analyzer generator (also known as scanner generator) for Java(tm), written in Java(tm). It is also a rewrite of the very useful tool JLex. JFlex is designed to work together with the LALR parser generator CUP, and the Java modification of Berkeley Yacc BYacc/J. It can also be used together with other parser generators like ANTLR or as a standalone tool. 
++JFlex is a lexical analyzer generator (also known as scanner generator) for Java(tm), written in Java(tm). It is also a rewrite of the very useful tool JLex. JFlex is designed to work together with the LALR parser generator CUP, and the Java modification of Berkeley Yacc BYacc/J. It can also be used together with other parser generators like ANTLR or as a standalone tool.
 +
 +.SH OPTIONS
 +.TP
 +\fB\-d\fR <directory>
 +write generated file to <directory>
 +.TP
 +\fB\-\-skel\fR <file>
 +use external skeleton <file>
 +.TP
 +\fB\-\-switch\fR, \fB\-\-table\fR, \fB\-\-pack\fR
 +set default code generation method
 +.TP
 +\fB\-\-jlex\fR
 +strict JLex compatibility
 +.TP
 +\fB\-\-nomin\fR
 +skip minimization step
 +.TP
 +\fB\-\-nobak\fR
 +don't create backup files
 +.TP
 +\fB\-\-dump\fR
 +display transition tables
 +.TP
 +\fB\-\-dot\fR
 +write graphviz .dot files for the generated automata (alpha)
 +.TP
 +\fB\-\-verbose\fR, \fB\-v\fR
 +display generation progress messages (default)
 +.TP
 +\fB\-\-quiet\fR, \fB\-q\fR
 +display errors only
 +.TP
 +\fB\-\-time\fR
 +display generation time statistics
 +.TP
 +\fB\-\-version\fR
 +print the version number of this copy of jflex
 +.TP
 +\fB\-\-info\fR
 +print system + JDK information
 +.TP
 +\fB\-\-help\fR, \fB\-h\fR
 +print this message
 +.PP
 +
 +.SH AUTHOR
 +This manual page was written by Wolfgang Baer <WBaer at gmx.de>,
 +for the Debian project (but may be used by others).
diff --cc debian/jflex.links
index 1505ca7,0000000..ab73abf
mode 100644,000000..100644
--- a/debian/jflex.links
+++ b/debian/jflex.links
@@@ -1,1 -1,0 +1,1 @@@
- usr/share/java/JFlex.jar usr/share/ant/lib/jflex.jar
++usr/share/java/jflex.jar usr/share/ant/lib/jflex.jar
diff --cc debian/jflex.poms
index 31485a7,0000000..9172857
mode 100644,000000..100644
--- a/debian/jflex.poms
+++ b/debian/jflex.poms
@@@ -1,1 -1,0 +1,1 @@@
- debian/pom.xml --usj-name=jflex --artifact=lib/JFlex.jar
++pom.xml --no-parent --usj-name=jflex --java-lib --artifact=lib/jflex-*.jar
diff --cc debian/patches/LexScan.flex.patch
index 0000000,0000000..a3bc4d0
new file mode 100644
--- /dev/null
+++ b/debian/patches/LexScan.flex.patch
@@@ -1,0 -1,0 +1,24 @@@
++From: Markus Koschany <apo at debian.org>
++Date: Wed, 27 Jul 2016 06:24:03 +0200
++Subject: LexScan.flex
++
++Fix FTBFS due to use of older JFlex version. As soon as 1.6.1-1 is available in
++Debian this patch can be dropped.
++
++Forwarded: not-needed
++---
++ src/main/jflex/LexScan.flex | 1 -
++ 1 file changed, 1 deletion(-)
++
++diff --git a/src/main/jflex/LexScan.flex b/src/main/jflex/LexScan.flex
++index cf47bb8..40f7a8e 100644
++--- a/src/main/jflex/LexScan.flex
+++++ b/src/main/jflex/LexScan.flex
++@@ -40,7 +40,6 @@ import jflex.unicode.UnicodeProperties;
++ %state CTOR_ARG, REGEXP_CODEPOINT_SEQUENCE
++ %state STRING_CODEPOINT_SEQUENCE, CHARCLASS_CODEPOINT
++ 
++-%inputstreamctor false
++ 
++ %cupdebug
++ 
diff --cc debian/patches/build.patch
index 0000000,0000000..bf54981
new file mode 100644
--- /dev/null
+++ b/debian/patches/build.patch
@@@ -1,0 -1,0 +1,44 @@@
++From: Markus Koschany <apo at debian.org>
++Date: Wed, 27 Jul 2016 06:17:03 +0200
++Subject: build
++
++Adjust the build system for Debian.
++
++Forwarded: not-needed
++---
++ build.xml | 8 +++++---
++ 1 file changed, 5 insertions(+), 3 deletions(-)
++
++diff --git a/build.xml b/build.xml
++index 777fd81..4ec755d 100644
++--- a/build.xml
+++++ b/build.xml
++@@ -14,8 +14,8 @@
++   <property name="lib.dir" value="lib"/>
++     
++   <!-- override these if you want to use your own versions -->
++-  <property name="bootstrap.jflex.jar" value="${lib.dir}/jflex-${bootstrap.version}.jar" />
++-  <property name="cup.jar" value="${lib.dir}/java-cup-${cup.version}.jar" />
+++  <property name="bootstrap.jflex.jar" value="/usr/share/ant/lib/jflex.jar" />
+++  <property name="cup.jar" value="/usr/share/java/cup.jar" />
++   <property name="junit.jar" value="${lib.dir}/junit-${junit.version}.jar" />
++ 
++   <!-- where to get tool jars from -->
++@@ -78,6 +78,8 @@
++           description="generate sources and compile all non-test classes">
++     <mkdir dir="${compile.output.dir}" />
++     <javac destdir="${compile.output.dir}"
+++           source="1.6"
+++           target="1.6"
++            debug="on"
++            includeantruntime="true">
++       <src path="src/main/java"/>
++@@ -113,7 +115,7 @@
++   </target>
++ 
++   <target name="-generate-scanner">
++-    <taskdef classname="jflex.anttask.JFlexTask" 
+++    <taskdef classname="JFlex.anttask.JFlexTask" 
++              name="jflex" classpath="${bootstrap.jflex.jar}"/>
++     <mkdir dir="${generated.sources.dir}"/>
++     <jflex file="src/main/jflex/LexScan.flex"
diff --cc debian/patches/jflex-executable.patch
index 0000000,0000000..934d0bd
new file mode 100644
--- /dev/null
+++ b/debian/patches/jflex-executable.patch
@@@ -1,0 -1,0 +1,21 @@@
++From: Markus Koschany <apo at debian.org>
++Date: Wed, 27 Jul 2016 06:59:36 +0200
++Subject: jflex executable
++
++Fix path to jflex.jar.
++
++Forwarded: not-needed
++---
++ bin/jflex | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/bin/jflex b/bin/jflex
++index 8ad97f1..2879f43 100755
++--- a/bin/jflex
+++++ b/bin/jflex
++@@ -42,4 +42,4 @@ JFLEX_HOME=${PRG}/..
++ 
++ # --------------------------------------------------------------------
++ 
++-$JAVA -Xmx128m -jar $JFLEX_HOME/lib/jflex-1.6.1.jar $@
+++$JAVA -Xmx128m -jar /usr/share/java/jflex.jar $@
diff --cc debian/patches/series
index 440dbf1,0000000..2a93861
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,0 +1,3 @@@
- 01_build_xml.patch
- 02_build_xml_jar.patch
- 02_example_url_fix.patch
- 03_build_xml_target.patch
- 03_script_cp_fix.patch
- 04_remove_timestamps.patch
++build.patch
++LexScan.flex.patch
++jflex-executable.patch
diff --cc debian/rules
index 3158976,0000000..ac8068d
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,26 -1,0 +1,19 @@@
 +#!/usr/bin/make -f
- 
- export UPSTREAM_VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
 +export JAVA_HOME := /usr/lib/jvm/default-java
 +
 +%:
 +	dh $@ --parallel --with maven_repo_helper
 +
 +override_dh_auto_build:
- 	ant -buildfile src/build.xml jar
++	ant -buildfile build.xml jar
 +
 +override_dh_auto_clean:
 +	dh_auto_clean
- 	ant -buildfile src/build.xml libclean jarclean
++	ant -buildfile build.xml clean
 +
 +override_dh_installchangelogs:
- 	dh_installchangelogs src/changelog
- 
- override_dh_install:
- 	install -m 644 lib/JFlex.jar debian/jflex/usr/share/java/JFlex-$(UPSTREAM_VERSION).jar
- 	ln -s JFlex-$(UPSTREAM_VERSION).jar debian/jflex/usr/share/java/JFlex.jar
- 	install -m 755 bin/jflex debian/jflex/usr/bin/jflex
- 
- #DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar junit
++	dh_installchangelogs changelog.md
 +
++get-orig-source:
++	uscan --download-current-version --force-download --repack --compression xz
 +
diff --cc debian/watch
index 34a97e4,0000000..f0d90be
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,0 +1,2 @@@
- version=3
- opts=dversionmangle=s/\+dfsg.*// \
- http://jflex.de/download.html  .*/jflex-([\d\.]+).zip 
++version=4
++  https://github.com/jflex-de/jflex/releases .*/jflex-?(\d\S*)\.tar\.gz

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



More information about the pkg-java-commits mailing list