This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository antlr.
commit ca872f9daf213084c2c7673f2e14067d6bebdf32 Author: Jan Dittberner <[email protected]> Date: Mon Jan 19 23:09:37 2009 +0000 improvements to the packaging - fix lintian warning patch-system-but-direct-changes-in-diff by moving bin/antlr to a patch file - fix lintian warnings debhelper-but-no-misc-depends by adding ${misc:Depends} where necessary - update to Standards-Version 3.8.0 - add quilt instructions to README.source --- bin/antlr | 5 ----- debian/README.source | 32 ++++++++++++++++++++++++++++++++ debian/changelog | 16 ++++++++++++++++ debian/control | 15 ++++++++++----- debian/patches/bin___antlr.diff | 9 +++++++++ debian/patches/series | 1 + debian/rules | 1 - 7 files changed, 68 insertions(+), 11 deletions(-) diff --git a/bin/antlr b/bin/antlr deleted file mode 100644 index b3a185e..0000000 --- a/bin/antlr +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -echo Running 'java antlr.Tool $*' with /usr/share/java/antlr.jar appended to the CLASSPATH variable -export CLASSPATH -CLASSPATH=$CLASSPATH:/usr/share/java/antlr.jar -java antlr.Tool $* diff --git a/debian/README.source b/debian/README.source index 23c729b..814d3bf 100644 --- a/debian/README.source +++ b/debian/README.source @@ -5,3 +5,35 @@ The following files got removed from the upstream release tarball as of examples/java/unicode.IDENTs/StreamConverter.java See Debian bug #340049 for more details. + +This package uses quilt in order to apply patches to the upstream source. +Patches are stored in debian/patches. For further details, see the man page for +quilt. + +All commands described below should be run from the top directory of the +package source tree, unless otherwise stated. + + * To generate the fully patched source, in a form ready for editing, that + would be built to create Debian packages, run: + + export QUILT_PATCHES=debian/patches + quilt push -a + + * To modify the source and save those modifications so that they will be + applied when building the package, pick a suitably informative patch file + name, for example Modify_README.source, and then run: + + export QUILT_PATCHES=debian/patches + quilt new Modify_README.source + quilt edit README.source + + This will place you in your default editor to modify the file. + Once your are done editing, save the file and run: + + quilt refresh + + * To remove source modifications that are currently being applied when + building the package, run: + + export QUILT_PATCHES=debian/patches + quilt top diff --git a/debian/changelog b/debian/changelog index 73b0b4e..908125d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +antlr (2.7.7-11) UNRELEASED; urgency=low + + [ Jan Dittberner ] + * add debian/patches/bin___antlr.diff, add it to debian/patches/series + and make it replace bin/antlr (fixes lintian warning + patch-system-but-direct-changes-in-diff) + * debian/rules: remove unnecessary dh_pysupport for antlr package as + Python code moved to python-antlr in 2.7.7-10 + * debian/control: + - update Standards-Version to 3.8.0 + - add ${misc:Depends} to Depends of all binary packages (fixes + lintian warnings debhelper-but-no-misc-depends) + * debian/README.source: add information on how to use quilt + + -- Debian Java Maintainers <[email protected]> Mon, 19 Jan 2009 23:29:36 +0100 + antlr (2.7.7-10) unstable; urgency=low [ Torsten Werner ] diff --git a/debian/control b/debian/control index ff8c1c6..8e82c2e 100644 --- a/debian/control +++ b/debian/control @@ -5,14 +5,14 @@ Maintainer: Debian Java Maintainers <[email protected] Uploaders: Arnaud Vandyck <[email protected]>, John Leuner <[email protected]>, Michael Koch <[email protected]>, Barry Hawkins <[email protected]>, Torsten Werner <[email protected]> Build-Depends: debhelper (>= 4), default-jdk-builddep, python, autotools-dev, python-all-dev (>= 2.3.5-11), sharutils, java-gcj-compat-dev, quilt Build-Depends-Indep: python-support (>= 0.3), nant, cli-common-dev (>= 0.4.4), mono-mcs (>= 1.0) | c-sharp-compiler -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/antlr Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/antlr Homepage: http://www.antlr2.org/ Package: antlr Architecture: all -Depends: libantlr-java (= ${binary:Version}), default-jre-headless | java1-runtime-headless | java2-runtime-headless +Depends: ${misc:Depends}, libantlr-java (= ${binary:Version}), default-jre-headless | java1-runtime-headless | java2-runtime-headless Description: language tool for constructing recognizers, compilers etc ANTLR, ANother Tool for Language Recognition, (formerly PCCTS) is a language tool that provides a framework for constructing recognizers, @@ -30,6 +30,7 @@ Description: language tool for constructing recognizers, compilers etc Package: libantlr-java Architecture: all +Depends: ${misc:Depends} Recommends: libantlr-java-gcj Replaces: antlr (<< 2.7.7-8) Description: language tool for constructing recognizers, compilers etc (java library) @@ -44,7 +45,8 @@ Description: language tool for constructing recognizers, compilers etc (java lib Package: libantlr-java-gcj Section: devel Architecture: any -Depends: libantlr-java (>= ${source:Version}), ${shlibs:Depends} +Depends: ${misc:Depends}, libantlr-java (>= ${source:Version}), + ${shlibs:Depends} Replaces: antlr-gcj Description: language tool for constructing recognizers, compilers etc Native support for gij for antlr. ANTLR stands for ANother @@ -56,6 +58,7 @@ Description: language tool for constructing recognizers, compilers etc Package: libantlr-dev Section: libdevel Architecture: any +Depends: ${misc:Depends} Recommends: antlr Description: language tool for constructing recognizers, compilers etc ANTLR, ANother Tool for Language Recognition, (formerly PCCTS) is @@ -68,6 +71,7 @@ Description: language tool for constructing recognizers, compilers etc Package: libantlr2.7-cil Section: libdevel Architecture: all +Depends: ${misc:Depends} Recommends: antlr Description: language tool for constructing recognizers, compilers etc ANTLR, ANother Tool for Language Recognition, (formerly PCCTS) is @@ -80,7 +84,7 @@ Description: language tool for constructing recognizers, compilers etc Package: cantlr Section: devel Architecture: any -Depends: gij, libantlr-java-gcj, ${shlibs:Depends} +Depends: ${misc:Depends}, gij, libantlr-java-gcj, ${shlibs:Depends} Description: language tool for constructing recognizers, compilers etc This is the native-compiled version of antlr. ANTLR stands for ANother Tool for Language Recognition, (formerly PCCTS). It is a language tool @@ -93,6 +97,7 @@ Description: language tool for constructing recognizers, compilers etc Package: antlr-doc Section: doc Architecture: all +Depends: ${misc:Depends} Conflicts: antlr (<< 2.7.6-8) Description: language tool for constructing recognizers, compilers etc This package contains the documentation and examples for antlr. @@ -107,7 +112,7 @@ Description: language tool for constructing recognizers, compilers etc Package: python-antlr Section: python Architecture: all -Depends: ${python:Depends} +Depends: ${misc:Depends}, ${python:Depends} Description: language tool for constructing recognizers, compilers etc This package contains the Python version of antlr. ANTLR stands for ANother Tool for Language Recognition, (formerly PCCTS). diff --git a/debian/patches/bin___antlr.diff b/debian/patches/bin___antlr.diff new file mode 100644 index 0000000..62b5da7 --- /dev/null +++ b/debian/patches/bin___antlr.diff @@ -0,0 +1,9 @@ +Add bin/antlr script +--- antlr-2.7.7.orig/bin/antlr ++++ antlr-2.7.7/bin/antlr +@@ -0,0 +1,5 @@ ++#!/bin/sh ++echo Running 'java antlr.Tool $*' with /usr/share/java/antlr.jar appended to the CLASSPATH variable ++export CLASSPATH ++CLASSPATH=$CLASSPATH:/usr/share/java/antlr.jar ++java antlr.Tool $* diff --git a/debian/patches/series b/debian/patches/series index ae65b50..1fb6f27 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ gcc.diff +bin___antlr.diff diff --git a/debian/rules b/debian/rules index 0490f51..758cb68 100755 --- a/debian/rules +++ b/debian/rules @@ -135,7 +135,6 @@ binary-indep: build-indep install-indep dh_installman -pantlr dh_installdocs -pantlr dh_installchangelogs -pantlr - dh_pysupport -pantlr dh_compress -pantlr dh_fixperms -pantlr dh_installdeb -pantlr -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/antlr.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
