This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository javacc4.
commit 55839e649d6fc390dd2e51f2d8d918f11e4532c4 Author: Emmanuel Bourg <[email protected]> Date: Fri Nov 18 17:11:32 2016 +0100 Cloned the javacc package and rolled back to the version 4 (Closes: #844744) --- debian/ant.properties | 4 ++++ debian/changelog | 6 ++++++ debian/clean | 7 ++++++- debian/control | 11 ++++++----- debian/copyright | 9 ++------- debian/javacc-doc.install | 2 -- debian/javacc.install | 3 --- debian/javacc.links | 2 -- debian/javacc.poms | 1 - debian/javacc4-doc.install | 2 ++ debian/javacc4.install | 3 +++ debian/javacc4.links | 2 ++ debian/javacc4.poms | 1 + debian/manpages | 2 +- debian/maven.rules | 1 + debian/patches/ParseGen.diff | 36 ------------------------------------ debian/patches/executables.patch | 6 +++--- debian/patches/javacctarget.patch | 32 +++++++++++++++++++++++++++----- debian/patches/series | 1 - debian/pom.xml | 22 ++++++++++++++++++++++ debian/rules | 23 +++++++++++++++++++---- debian/watch | 6 +++--- 22 files changed, 108 insertions(+), 74 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties new file mode 100644 index 0000000..d9d9eb9 --- /dev/null +++ b/debian/ant.properties @@ -0,0 +1,4 @@ +bootstrap.javacc.mainclass=javacc +bootstrap.jjtree.mainclass=jjtree +ant.build.javac.source=1.4 +ant.build.javac.target=1.4 diff --git a/debian/changelog b/debian/changelog index 3f3657f..91b1467 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +javacc4 (4.0-1) unstable; urgency=medium + + * Cloned the javacc package and rolled back to the version 4 (Closes: #844744) + + -- Emmanuel Bourg <[email protected]> Fri, 18 Nov 2016 16:34:41 +0100 + javacc (5.0-7) unstable; urgency=medium * Build with the DH sequencer instead of CDBS diff --git a/debian/clean b/debian/clean index 53585a9..3b2625a 100644 --- a/debian/clean +++ b/debian/clean @@ -1 +1,6 @@ -bin/javacc.1 +bin/javacc4.1 +bin/javacc4 +bin/jjdoc4 +bin/jjtree4 +bootstrap/ +test.tmp/ diff --git a/debian/control b/debian/control index f8881c0..167d3df 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: javacc +Source: javacc4 Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> @@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 10), default-jdk, docbook-to-man, + javacc, junit, libxalan2-java, maven-repo-helper @@ -17,10 +18,10 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-java/javacc.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/javacc.git Homepage: http://javacc.org -Package: javacc +Package: javacc4 Architecture: all Depends: default-jre-headless (>= 2:1.5) | java5-runtime-headless, ${misc:Depends} -Suggests: javacc-doc +Suggests: javacc4-doc Description: Parser generator for use with Java Java Compiler-Compiler (JavaCC) is (according to sun) "the most popular parser generator" for use with Java [tm] @@ -33,11 +34,11 @@ Description: Parser generator for use with Java generation such as tree building (via a tool called JJTree included with JavaCC), actions, debugging, etc. -Package: javacc-doc +Package: javacc4-doc Architecture: all Section: doc Depends: ${misc:Depends}, default-jdk-doc -Suggests: javacc +Suggests: javacc4 Description: Documentation for the JavaCC Parser Generator Documentation and examples for JavaCC parser generator. . diff --git a/debian/copyright b/debian/copyright index 077a273..8e599ef 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,16 +1,11 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: JavaCC -Upstream-Contact: Sreenivasa Viswanadha <[email protected]> Source: https://github.com/javacc/javacc Files-Excluded: lib/*.jar - junit.jar + bootstrap/javacc.jar Files: * -Copyright: 2005-2006, Kees Jan Koster [email protected] - 2006, Sreenivasa Viswanadha <[email protected]> - 2006-2007, Sun Microsystems, Inc. - 2006, Tim Pizey - 2007, Paul Cager +Copyright: 2002-2006, Sun Microsystems, Inc. License: BSD-3-clause Files: debian/* diff --git a/debian/javacc-doc.install b/debian/javacc-doc.install deleted file mode 100644 index 21bd6a5..0000000 --- a/debian/javacc-doc.install +++ /dev/null @@ -1,2 +0,0 @@ -www/doc usr/share/doc/javacc -examples usr/share/doc/javacc diff --git a/debian/javacc.install b/debian/javacc.install deleted file mode 100644 index b5b8da7..0000000 --- a/debian/javacc.install +++ /dev/null @@ -1,3 +0,0 @@ -bin/javacc /usr/bin -bin/jjdoc /usr/bin -bin/jjtree /usr/bin diff --git a/debian/javacc.links b/debian/javacc.links deleted file mode 100644 index 64b3002..0000000 --- a/debian/javacc.links +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/man/man1/javacc.1 usr/share/man/man1/jjtree.1 -usr/share/man/man1/javacc.1 usr/share/man/man1/jjdoc.1 diff --git a/debian/javacc.poms b/debian/javacc.poms deleted file mode 100644 index 9b0289e..0000000 --- a/debian/javacc.poms +++ /dev/null @@ -1 +0,0 @@ -pom.xml --java-lib -e5.0 --artifact=bin/lib/javacc.jar diff --git a/debian/javacc4-doc.install b/debian/javacc4-doc.install new file mode 100644 index 0000000..22e0e27 --- /dev/null +++ b/debian/javacc4-doc.install @@ -0,0 +1,2 @@ +www/doc usr/share/doc/javacc4 +examples usr/share/doc/javacc4 diff --git a/debian/javacc4.install b/debian/javacc4.install new file mode 100644 index 0000000..18bccd7 --- /dev/null +++ b/debian/javacc4.install @@ -0,0 +1,3 @@ +bin/javacc4 /usr/bin +bin/jjdoc4 /usr/bin +bin/jjtree4 /usr/bin diff --git a/debian/javacc4.links b/debian/javacc4.links new file mode 100644 index 0000000..493376f --- /dev/null +++ b/debian/javacc4.links @@ -0,0 +1,2 @@ +usr/share/man/man1/javacc4.1 usr/share/man/man1/jjtree4.1 +usr/share/man/man1/javacc4.1 usr/share/man/man1/jjdoc4.1 diff --git a/debian/javacc4.poms b/debian/javacc4.poms new file mode 100644 index 0000000..65e85f8 --- /dev/null +++ b/debian/javacc4.poms @@ -0,0 +1 @@ +debian/pom.xml --java-lib -e4.0 --artifact=bin/lib/javacc.jar --usj-name=javacc4 diff --git a/debian/manpages b/debian/manpages index 53585a9..69d826e 100644 --- a/debian/manpages +++ b/debian/manpages @@ -1 +1 @@ -bin/javacc.1 +bin/javacc4.1 diff --git a/debian/maven.rules b/debian/maven.rules index b80c7d5..814ef0d 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1 +1,2 @@ junit * * s/3\..*/3.x/ +net.java.dev.javacc javacc * s/.*/4.0/ * * diff --git a/debian/patches/ParseGen.diff b/debian/patches/ParseGen.diff deleted file mode 100644 index 671b38f..0000000 --- a/debian/patches/ParseGen.diff +++ /dev/null @@ -1,36 +0,0 @@ -Description: Fixes a regression causing the encountered/expected token list to be empty -Author: Dag H. Wanvik <[email protected]> -Forwarded: yes -Bug: https://java.net/jira/browse/JAVACC-244 ---- a/src/org/javacc/parser/ParseGen.java -+++ b/src/org/javacc/parser/ParseGen.java -@@ -570,21 +570,24 @@ - ostr.println(" for (int i = 0; i < jj_endpos; i++) {"); - ostr.println(" jj_expentry[i] = jj_lasttokens[i];"); - ostr.println(" }"); -+ ostr.println(" boolean exists = false;"); - if (!Options.getGenerateGenerics()) -- ostr.println(" jj_entries_loop: for (java.util.Iterator it = jj_expentries.iterator(); it.hasNext();) {"); -+ ostr.println(" for (java.util.Iterator it = jj_expentries.iterator(); it.hasNext();) {"); - else -- ostr.println(" jj_entries_loop: for (java.util.Iterator<?> it = jj_expentries.iterator(); it.hasNext();) {"); -+ ostr.println(" for (java.util.Iterator<?> it = jj_expentries.iterator(); it.hasNext();) {"); -+ ostr.println(" exists = true;"); - ostr.println(" int[] oldentry = (int[])(it.next());"); - ostr.println(" if (oldentry.length == jj_expentry.length) {"); - ostr.println(" for (int i = 0; i < jj_expentry.length; i++) {"); - ostr.println(" if (oldentry[i] != jj_expentry[i]) {"); -- ostr.println(" continue jj_entries_loop;"); -+ ostr.println(" exists = false;"); -+ ostr.println(" break;"); - ostr.println(" }"); - ostr.println(" }"); -- ostr.println(" jj_expentries.add(jj_expentry);"); -- ostr.println(" break jj_entries_loop;"); -+ ostr.println(" if (exists) break;"); - ostr.println(" }"); - ostr.println(" }"); -+ ostr.println(" if (!exists) jj_expentries.add(jj_expentry);"); - ostr.println(" if (pos != 0) jj_lasttokens[(jj_endpos = pos) - 1] = kind;"); - ostr.println(" }"); - ostr.println(" }"); diff --git a/debian/patches/executables.patch b/debian/patches/executables.patch index 818c840..cec288c 100644 --- a/debian/patches/executables.patch +++ b/debian/patches/executables.patch @@ -9,7 +9,7 @@ Forwarded: not-needed -case "`uname`" in - CYGWIN*) JAR="`cygpath --windows -- "$JAR"`" ;; -esac -+JAR=/usr/share/java/javacc.jar ++JAR=/usr/share/java/javacc4.jar java -classpath "$JAR" javacc "$@" @@ -22,7 +22,7 @@ Forwarded: not-needed -case "`uname`" in - CYGWIN*) JAR="`cygpath --windows -- "$JAR"`" ;; -esac -+JAR=/usr/share/java/javacc.jar ++JAR=/usr/share/java/javacc4.jar java -classpath "$JAR" jjdoc "$@" @@ -35,7 +35,7 @@ Forwarded: not-needed -case "`uname`" in - CYGWIN*) JAR="`cygpath --windows -- "$JAR"`" ;; -esac -+JAR=/usr/share/java/javacc.jar ++JAR=/usr/share/java/javacc4.jar java -classpath "$JAR" jjtree "$@" diff --git a/debian/patches/javacctarget.patch b/debian/patches/javacctarget.patch index 0d2b466..69b6262 100644 --- a/debian/patches/javacctarget.patch +++ b/debian/patches/javacctarget.patch @@ -2,13 +2,35 @@ Description: Set the compiler target Forwarded: not-needed --- a/src/org/javacc/parser/build.xml +++ b/src/org/javacc/parser/build.xml -@@ -52,7 +52,8 @@ - <javac srcdir="${javacc.root}/src" +@@ -46,6 +46,7 @@ destdir="${javacc.root}/classes" debug="${build.compiler.debug}" -- source="1.4" -+ source="1.5" -+ target="1.5" + source="1.4" ++ target="1.4" classpath="${javacc.root}/classes:${junit.jar}"> </javac> </target> +@@ -80,6 +81,7 @@ + <java classname="${bootstrap.javacc.mainclass}" + classpath="${javacc.root}/bootstrap/javacc.jar" + fork="true"> ++ <arg value="-JDK_VERSION=1.4"/> + <arg file="JavaCC.jj"/> + </java> + </target> +--- a/src/org/javacc/jjtree/build.xml ++++ b/src/org/javacc/jjtree/build.xml +@@ -114,11 +114,13 @@ + <java classname="${bootstrap.jjtree.mainclass}" + classpath="${javacc.root}/bootstrap/javacc.jar" + fork="true"> ++ <arg value="-JDK_VERSION=1.4"/> + <arg file="JJTree.jjt"/> + </java> + <java classname="${bootstrap.javacc.mainclass}" + classpath="${javacc.root}/bootstrap/javacc.jar" + fork="true"> ++ <arg value="-JDK_VERSION=1.4"/> + <arg file="JJTree.jj"/> + </java> + </target> diff --git a/debian/patches/series b/debian/patches/series index 3ba2cad..bc1e445 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ executables.patch javacctarget.patch -ParseGen.diff diff --git a/debian/pom.xml b/debian/pom.xml new file mode 100644 index 0000000..b85a1c9 --- /dev/null +++ b/debian/pom.xml @@ -0,0 +1,22 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>net.java.dev.javacc</groupId> + <artifactId>javacc</artifactId> + <version>4.0</version> + <packaging>jar</packaging> + <name>JavaCC</name> + <url>http://javacc.dev.java.net/</url> + <description>Java Compiler Compiler [tm] (JavaCC [tm]) is the most popular parser generator for use with Java [tm] applications.</description> + <licenses> + <license> + <name>The BSD License</name> + <url>http://www.opensource.org/licenses/bsd-license.html</url> + <distribution>repo</distribution> + </license> + </licenses> + <scm> + <connection>scm:cvs:pserver:[email protected]:/cvs:javacc</connection> + <developerConnection>scm:cvs:pserver:${maven.username}@cvs.dev.java.net:/cvs:javacc</developerConnection> + <url>https://javacc.dev.java.net/source/browse/javacc/</url> + </scm> +</project> diff --git a/debian/rules b/debian/rules index baafd34..d5b010d 100755 --- a/debian/rules +++ b/debian/rules @@ -6,13 +6,28 @@ VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p') dh $@ --with maven-repo-helper override_dh_auto_build: - dh_auto_build -- jar update-bootstrap -Dversion=$(VERSION) - dh_auto_build -- clean + mkdir -p bootstrap + + # Build with JavaCC 5 + cp /usr/share/java/javacc.jar bootstrap/ + dh_auto_build -- jar -Dversion=$(VERSION) + + # Rebuild with JavaCC 4 + cp bin/lib/javacc.jar bootstrap/ + dh_auto_build -- realclean dh_auto_build -- jar - docbook-to-man debian/manpage.sgml >bin/javacc.1 + + docbook-to-man debian/manpage.sgml >bin/javacc4.1 + + cp bin/javacc bin/javacc4 + cp bin/jjdoc bin/jjdoc4 + cp bin/jjtree bin/jjtree4 override_dh_auto_test: - dh_auto_build -- unittest + dh_auto_build -- test + +override_dh_auto_clean: + dh_auto_build -- realclean get-orig-source: uscan --download-current-version --force-download --rename --repack --compression xz diff --git a/debian/watch b/debian/watch index 7eaba66..cdabfa1 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ -version=3 -opts=uversionmangle=s/_/./g \ -https://github.com/javacc/javacc/tags .*/release_(\d_[\d_]+).tar.gz +version=4 +opts="mode=git, uversionmangle=s/(\d)(\d)/$1.$2/g" \ +https://github.com/javacc/javacc .*/release_(40) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/javacc4.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
