This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository javacc.
commit ab59142c104956c280f3f1af5c8e3159f9506755 Author: Emmanuel Bourg <[email protected]> Date: Tue May 7 11:21:29 2013 +0000 Fixed the watch file Enabled the unit tests Updated Standards-Version to 3.9.4 Switched to quilt for managing the patches Removed Michael Koch from the Uploaders list (Closes: #654030) Replaced the dependency of the documentation package on classpath-doc with default-jre-doc debian/rules: Added a clean target to allow rebuilds debian/copyright: Updated to the Copyright Format 1.0 --- debian/changelog | 15 ++++++++ debian/control | 10 ++--- debian/copyright | 77 ++++++++++++++++++++++++++++++--------- debian/patches/executables.patch | 15 +++----- debian/patches/javacctarget.patch | 5 +-- debian/patches/series | 2 + debian/rules | 8 +++- debian/watch | 2 +- 8 files changed, 97 insertions(+), 37 deletions(-) diff --git a/debian/changelog b/debian/changelog index a61ca08..d0a2e17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +javacc (5.0-5) unstable; urgency=low + + * Team upload. + * Fixed the watch file + * Enabled the unit tests + * Updated Standards-Version to 3.9.4 + * Switched to quilt for managing the patches + * Removed Michael Koch from the Uploaders list (Closes: #654030) + * Replaced the dependency of the documentation package on classpath-doc + with default-jre-doc + * debian/rules: Added a clean target to allow rebuilds + * debian/copyright: Updated to the Copyright Format 1.0 + + -- Emmanuel Bourg <[email protected]> Tue, 07 May 2013 13:14:38 +0200 + javacc (5.0-4) unstable; urgency=low [ Torsten Werner ] diff --git a/debian/control b/debian/control index 439d768..e7eee54 100644 --- a/debian/control +++ b/debian/control @@ -2,11 +2,11 @@ Source: javacc Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Michael Koch <[email protected]> +Uploaders: Emmanuel Bourg <[email protected]> Build-Depends: ant, debhelper (>= 7), cdbs (>= 0.4.5.3), default-jdk Build-Depends-Indep: ant-optional, libxalan2-java, docbook-to-man, junit, maven-repo-helper -Standards-Version: 3.8.4 -Homepage: http://javacc.dev.java.net/ +Standards-Version: 3.9.4 +Homepage: http://javacc.java.net Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/javacc Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/javacc @@ -14,7 +14,7 @@ Package: javacc Architecture: all Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless, ${misc:Depends} Suggests: javacc-doc -Description: A parser generator for use with Java +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] applications. @@ -29,7 +29,7 @@ Description: A parser generator for use with Java Package: javacc-doc Architecture: all Section: doc -Depends: classpath-doc, ${misc:Depends} +Depends: default-jdk-doc, ${misc:Depends} Suggests: javacc Description: Documentation for the JavaCC Parser Generator Documentation and examples for JavaCC parser generator. diff --git a/debian/copyright b/debian/copyright index c876102..2cf1343 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,20 +1,63 @@ -This package was debianized by Nicolas Sabouret <[email protected]> on -Tue, 15 Jul 2003 10:21:45 +0200. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: JavaCC +Upstream-Contact: Sreenivasa Viswanadha <[email protected]> +Source: http://javacc.java.net -It was downloaded from http://javacc.dev.java.net/ +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 +License: BSD-3-clause + 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 name of the Sun Microsystems, Inc. nor the names of its + 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. -Upstream Author: mailto:[email protected] +Files: debian/* +Copyright: 2003, Nicolas Sabouret <[email protected]> +License: BSD-3-clause + 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 name of the Sun Microsystems, Inc. nor the names of its + 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. -Copyright: - Copyright (c) 2005-2006, Kees Jan Koster [email protected] - Copyright (c) 2006, Sreenivasa Viswanadha <[email protected]> - Copyright (c) 2006-2007, Sun Microsystems, Inc. - Copyright (c) 2006, Tim Pizey - Copyright (c) 2007, Paul Cager. - -License: - This software is licenced under the Berkeley Software - Distribution (BSD) License - - A copy of the licence is available on Debian systems in: - /usr/share/common-licenses/BSD diff --git a/debian/patches/executables.patch b/debian/patches/executables.patch index 536b832..7e809c8 100644 --- a/debian/patches/executables.patch +++ b/debian/patches/executables.patch @@ -1,6 +1,5 @@ -diff -urNad javacc_4.0+cvs20070207~/bin/javacc javacc_4.0+cvs20070207/bin/javacc ---- javacc_4.0+cvs20070207~/bin/javacc 2005-04-30 08:08:06.000000000 +0100 -+++ javacc_4.0+cvs20070207/bin/javacc 2007-02-28 22:36:33.000000000 +0000 +--- a/bin/javacc ++++ b/bin/javacc @@ -1,9 +1,5 @@ #!/bin/sh -JAR="`dirname $0`/lib/javacc.jar" @@ -12,9 +11,8 @@ diff -urNad javacc_4.0+cvs20070207~/bin/javacc javacc_4.0+cvs20070207/bin/javacc java -classpath "$JAR" javacc "$@" -diff -urNad javacc_4.0+cvs20070207~/bin/jjdoc javacc_4.0+cvs20070207/bin/jjdoc ---- javacc_4.0+cvs20070207~/bin/jjdoc 2005-04-30 08:08:07.000000000 +0100 -+++ javacc_4.0+cvs20070207/bin/jjdoc 2007-02-28 22:36:50.000000000 +0000 +--- a/bin/jjdoc ++++ b/bin/jjdoc @@ -1,9 +1,5 @@ #!/bin/sh -JAR="`dirname $0`/lib/javacc.jar" @@ -26,9 +24,8 @@ diff -urNad javacc_4.0+cvs20070207~/bin/jjdoc javacc_4.0+cvs20070207/bin/jjdoc java -classpath "$JAR" jjdoc "$@" -diff -urNad javacc_4.0+cvs20070207~/bin/jjtree javacc_4.0+cvs20070207/bin/jjtree ---- javacc_4.0+cvs20070207~/bin/jjtree 2005-04-30 08:08:07.000000000 +0100 -+++ javacc_4.0+cvs20070207/bin/jjtree 2007-02-28 22:36:59.000000000 +0000 +--- a/bin/jjtree ++++ b/bin/jjtree @@ -1,9 +1,5 @@ #!/bin/sh -JAR="`dirname $0`/lib/javacc.jar" diff --git a/debian/patches/javacctarget.patch b/debian/patches/javacctarget.patch index 8650292..93275e8 100644 --- a/debian/patches/javacctarget.patch +++ b/debian/patches/javacctarget.patch @@ -1,6 +1,5 @@ -diff -urNad javacc_4.0+cvs20070207~/src/org/javacc/parser/build.xml javacc_4.0+cvs20070207/src/org/javacc/parser/build.xml ---- javacc-4.0+cvs20070207.orig/src/org/javacc/parser/build.xml -+++ javacc-4.0+cvs20070207/src/org/javacc/parser/build.xml +--- a/src/org/javacc/parser/build.xml ++++ b/src/org/javacc/parser/build.xml @@ -53,6 +53,7 @@ destdir="${javacc.root}/classes" debug="${build.compiler.debug}" diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..bc1e445 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +executables.patch +javacctarget.patch diff --git a/debian/rules b/debian/rules index 7eca18c..214f050 100755 --- a/debian/rules +++ b/debian/rules @@ -2,18 +2,22 @@ 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 PACKAGE := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ') JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar junit +DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar $(ANT_HOME)/lib/ant-junit.jar junit DEB_ANT_BUILD_TARGET := jar DEB_ANT_CLEAN_TARGET := realclean +DEB_ANT_CHECK_TARGET := unittest DEB_ANT_BUILDFILE := build.xml DEB_ANT_ARGS := -Dversion=$(DEB_UPSTREAM_VERSION) +clean:: + mh_clean + rm -f bin/javacc.1 + binary-post-install/$(PACKAGE):: mh_installpom -p$(PACKAGE) -e$(DEB_UPSTREAM_VERSION) pom.xml mh_installjar -p$(PACKAGE) -e$(DEB_UPSTREAM_VERSION) -l pom.xml \ diff --git a/debian/watch b/debian/watch index 995fcec..c2c12f4 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 opts=dversionmangle=s/\+cvs.*// \ -https://javacc.dev.java.net/servlets/ProjectDocumentList .*javacc-([\d\.]*)src.tar.gz debian debian/orig-tar.sh +https://java.net/projects/javacc/downloads .*javacc-([\d\.]*)src.tar.gz debian debian/orig-tar.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/javacc.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
