[pkg-java] r7850 - in trunk/antlr: bin debian debian/patches

jandd-guest at alioth.debian.org jandd-guest at alioth.debian.org
Mon Jan 19 23:09:37 UTC 2009


Author: jandd-guest
Date: 2009-01-19 23:09:37 +0000 (Mon, 19 Jan 2009)
New Revision: 7850

Added:
   trunk/antlr/debian/patches/bin___antlr.diff
Removed:
   trunk/antlr/bin/antlr
Modified:
   trunk/antlr/debian/README.source
   trunk/antlr/debian/changelog
   trunk/antlr/debian/control
   trunk/antlr/debian/patches/series
   trunk/antlr/debian/rules
Log:
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


Deleted: trunk/antlr/bin/antlr
===================================================================
--- trunk/antlr/bin/antlr	2009-01-19 22:47:00 UTC (rev 7849)
+++ trunk/antlr/bin/antlr	2009-01-19 23:09:37 UTC (rev 7850)
@@ -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 $*

Modified: trunk/antlr/debian/README.source
===================================================================
--- trunk/antlr/debian/README.source	2009-01-19 22:47:00 UTC (rev 7849)
+++ trunk/antlr/debian/README.source	2009-01-19 23:09:37 UTC (rev 7850)
@@ -5,3 +5,35 @@
   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

Modified: trunk/antlr/debian/changelog
===================================================================
--- trunk/antlr/debian/changelog	2009-01-19 22:47:00 UTC (rev 7849)
+++ trunk/antlr/debian/changelog	2009-01-19 23:09:37 UTC (rev 7850)
@@ -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 <pkg-java-maintainers at lists.alioth.debian.org>  Mon, 19 Jan 2009 23:29:36 +0100
+
 antlr (2.7.7-10) unstable; urgency=low
 
   [ Torsten Werner ]

Modified: trunk/antlr/debian/control
===================================================================
--- trunk/antlr/debian/control	2009-01-19 22:47:00 UTC (rev 7849)
+++ trunk/antlr/debian/control	2009-01-19 23:09:37 UTC (rev 7850)
@@ -5,14 +5,14 @@
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, John Leuner <jewel at debian.org>, Michael Koch <konqueror at gmx.de>, Barry Hawkins <barry at bytemason.org>, Torsten Werner <twerner at debian.org>
 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 @@
 
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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).

Added: trunk/antlr/debian/patches/bin___antlr.diff
===================================================================
--- trunk/antlr/debian/patches/bin___antlr.diff	                        (rev 0)
+++ trunk/antlr/debian/patches/bin___antlr.diff	2009-01-19 23:09:37 UTC (rev 7850)
@@ -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 $*

Modified: trunk/antlr/debian/patches/series
===================================================================
--- trunk/antlr/debian/patches/series	2009-01-19 22:47:00 UTC (rev 7849)
+++ trunk/antlr/debian/patches/series	2009-01-19 23:09:37 UTC (rev 7850)
@@ -1 +1,2 @@
 gcc.diff
+bin___antlr.diff

Modified: trunk/antlr/debian/rules
===================================================================
--- trunk/antlr/debian/rules	2009-01-19 22:47:00 UTC (rev 7849)
+++ trunk/antlr/debian/rules	2009-01-19 23:09:37 UTC (rev 7850)
@@ -135,7 +135,6 @@
 	dh_installman -pantlr
 	dh_installdocs -pantlr
 	dh_installchangelogs -pantlr
-	dh_pysupport -pantlr
 	dh_compress -pantlr
 	dh_fixperms -pantlr
 	dh_installdeb -pantlr




More information about the pkg-java-commits mailing list