[jflex] 09/33: Fixed extra trunk / branches directories

Markus Koschany apo at moszumanska.debian.org
Wed Jul 27 10:45:10 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 56fe40ea1afcb976badc63c749a7b846b44f2a05
Author: Paul Cager <paul-debian at home.paulcager.org>
Date:   Mon Jul 2 22:18:40 2007 +0000

    Fixed extra trunk / branches directories
---
 debian/changelog                               |  7 +++
 debian/control                                 |  2 +-
 trunk/debian/changelog                         | 85 --------------------------
 trunk/debian/compat                            |  1 -
 trunk/debian/control                           | 20 ------
 trunk/debian/copyright                         | 20 ------
 trunk/debian/dirs                              |  2 -
 trunk/debian/doc-base                          | 15 -----
 trunk/debian/docs                              |  5 --
 trunk/debian/jflex.1                           | 57 -----------------
 trunk/debian/manpages                          |  1 -
 trunk/debian/patches/01_build_xml.patch        | 11 ----
 trunk/debian/patches/02_build_xml_jar.patch    | 10 ---
 trunk/debian/patches/02_example_url_fix.patch  | 12 ----
 trunk/debian/patches/03_build_xml_target.patch | 11 ----
 trunk/debian/patches/03_script_cp_fix.patch    | 13 ----
 trunk/debian/rules                             | 22 -------
 17 files changed, 8 insertions(+), 286 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9a10780..092478e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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
diff --git a/debian/control b/debian/control
index effa2f5..799cc8c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: jflex
 Section: devel
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Takashi Okamoto <tora at debian.org>, Wolfgang Baer <WBaer at gmx.de>
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
 Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, kaffe (>= 2:1.1.5-3), ant, junit
 Standards-Version: 3.6.2
 
diff --git a/trunk/debian/changelog b/trunk/debian/changelog
deleted file mode 100644
index 092478e..0000000
--- a/trunk/debian/changelog
+++ /dev/null
@@ -1,85 +0,0 @@
-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)
-  * Transfered 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 cotrol 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
-
-Local variables:
-mode: debian-changelog
-End:
diff --git a/trunk/debian/compat b/trunk/debian/compat
deleted file mode 100644
index 8adb55b..0000000
--- a/trunk/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-4 
diff --git a/trunk/debian/control b/trunk/debian/control
deleted file mode 100644
index 799cc8c..0000000
--- a/trunk/debian/control
+++ /dev/null
@@ -1,20 +0,0 @@
-Source: jflex
-Section: devel
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, kaffe (>= 2:1.1.5-3), ant, junit
-Standards-Version: 3.6.2
-
-Package: jflex
-Architecture: all
-Depends: kaffe | java-virtual-machine, kaffe | java1-runtime | java2-runtime
-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 --git a/trunk/debian/copyright b/trunk/debian/copyright
deleted file mode 100644
index 8f9649d..0000000
--- a/trunk/debian/copyright
+++ /dev/null
@@ -1,20 +0,0 @@
-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>
-
-Copyright:
-
-JFlex - Copying, Warranty & License
-
-JFlex is free software, published under the terms of the GNU General Public License. 
-
-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.
-
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/trunk/debian/dirs b/trunk/debian/dirs
deleted file mode 100644
index 60dac6d..0000000
--- a/trunk/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/java
-usr/bin
diff --git a/trunk/debian/doc-base b/trunk/debian/doc-base
deleted file mode 100644
index 594349a..0000000
--- a/trunk/debian/doc-base
+++ /dev/null
@@ -1,15 +0,0 @@
-Document: jflex
-Title: Manual for JFlex
-Author: Gerwin Klein
-Abstract: Manual of JFlex, a lexical analyzer generator for Java.
-Section: Apps/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 --git a/trunk/debian/docs b/trunk/debian/docs
deleted file mode 100644
index fc4f0f7..0000000
--- a/trunk/debian/docs
+++ /dev/null
@@ -1,5 +0,0 @@
-jflex/doc/manual*
-jflex/doc/*.png
-jflex/doc/jflex_anttask.html
-jflex/doc/logo.gif 
-jflex/examples
diff --git a/trunk/debian/jflex.1 b/trunk/debian/jflex.1
deleted file mode 100644
index be025d3..0000000
--- a/trunk/debian/jflex.1
+++ /dev/null
@@ -1,57 +0,0 @@
-.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. 
-
-.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 --git a/trunk/debian/manpages b/trunk/debian/manpages
deleted file mode 100644
index e4585ad..0000000
--- a/trunk/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/jflex.1 
diff --git a/trunk/debian/patches/01_build_xml.patch b/trunk/debian/patches/01_build_xml.patch
deleted file mode 100644
index 366ce03..0000000
--- a/trunk/debian/patches/01_build_xml.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- jflex/src/build.xml.orig	2004-05-20 01:37:43.000000000 +0200
-+++ jflex/src/build.xml	2005-10-06 21:03:41.000000000 +0200
-@@ -55,7 +55,7 @@
-   <target name="cbuild" depends="libclean,compile,jar" 
-           description="recompile and pack all classes"/> 
- 
--  <target name="compile" depends="jflex,cup"
-+  <target name="compile"
-           description="compile all classes">
-     <javac srcdir="." 
-            destdir="../lib" 
diff --git a/trunk/debian/patches/02_build_xml_jar.patch b/trunk/debian/patches/02_build_xml_jar.patch
deleted file mode 100644
index e57aa16..0000000
--- a/trunk/debian/patches/02_build_xml_jar.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- jflex/src/build.xml.orig	2005-10-07 10:36:49.000000000 +0200
-+++ jflex/src/build.xml	2005-10-07 10:43:51.000000000 +0200
-@@ -80,6 +80,7 @@
-   <target name="jar" depends="compile,copy" description="make JFlex.jar">
-     <jar basedir="../lib" 
-     	 includes="JFlex/**,java_cup/**,skeleton" 
-+         excludes="JFlex/tests/**"
-     	 jarfile="../lib/JFlex.jar" 
-     	 manifest="manifest"/>
-   </target>
diff --git a/trunk/debian/patches/02_example_url_fix.patch b/trunk/debian/patches/02_example_url_fix.patch
deleted file mode 100644
index 897bfc2..0000000
--- a/trunk/debian/patches/02_example_url_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- jflex/examples/byaccj/README.orig	2003-01-07 16:30:17.000000000 +0100
-+++ jflex/examples/byaccj/README	2005-10-06 21:08:38.000000000 +0200
-@@ -1,8 +1,7 @@
- This directory contains an interoperability example for BYacc/J and JFlex
- (a small calculator)
- 
--You need the parser generator byacc/j from
--http://troi.lincom-asg.com/~rjamison/byacc/
-+You need the parser generator byacc/j from http://byaccj.sourceforge.net/
- for this example to work (version byacc/j 1.1 has been tested).
- 
- Use the Makefile to generate the lexer and parser.
diff --git a/trunk/debian/patches/03_build_xml_target.patch b/trunk/debian/patches/03_build_xml_target.patch
deleted file mode 100644
index 91f020e..0000000
--- a/trunk/debian/patches/03_build_xml_target.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- jflex/src/build.xml.orig	2006-01-16 11:38:18.000000000 +0100
-+++ jflex/src/build.xml	2006-01-16 11:40:24.000000000 +0100
-@@ -59,7 +59,7 @@
-           description="compile all classes">
-     <javac srcdir="." 
-            destdir="../lib" 
--           target="1.1"
-+           target="1.3" source="1.3"
-            classpath="."
-            debug="on" />
-   </target>
diff --git a/trunk/debian/patches/03_script_cp_fix.patch b/trunk/debian/patches/03_script_cp_fix.patch
deleted file mode 100644
index e1c377d..0000000
--- a/trunk/debian/patches/03_script_cp_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- jflex/bin/jflex.orig	2003-01-07 16:29:31.000000000 +0100
-+++ jflex/bin/jflex	2005-10-06 21:16:57.000000000 +0200
-@@ -42,8 +42,9 @@
- 
- # --------------------------------------------------------------------
- 
-+CLASSPATH=/usr/share/java/JFlex.jar:${CLASSPATH}
- export CLASSPATH
--CLASSPATH=$JFLEX_HOME/lib/JFlex.jar
-+
- 
- $JAVA JFlex.Main $@
- 
diff --git a/trunk/debian/rules b/trunk/debian/rules
deleted file mode 100755
index 2e66abf..0000000
--- a/trunk/debian/rules
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/make -f
-# debian/rules file for jflex (uses cdbs)
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
-export UPSTREAM_VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
-
-JAVA_HOME := /usr/lib/kaffe
-ANT_HOME := /usr/share/ant
-
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar junit
-
-DEB_ANT_BUILDFILE := jflex/src/build.xml
-DEB_ANT_BUILD_TARGET := jar 
-DEB_ANT_CLEAN_TARGET := libclean jarclean
-
-install/jflex::
-	install -m 644 jflex/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 -m755 jflex/bin/jflex debian/jflex/usr/bin/jflex

-- 
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