Author: twerner Date: 2009-01-15 19:44:44 +0000 (Thu, 15 Jan 2009) New Revision: 7827
Added: trunk/antlr/debian/patches/ trunk/antlr/debian/patches/gcc.diff trunk/antlr/debian/patches/series Removed: trunk/antlr/lib/ Modified: trunk/antlr/debian/changelog trunk/antlr/debian/control trunk/antlr/debian/rules Log: * Convert changes to Charscanner.hpp to a patch file. * Fixed cantlr package to depend on libantlr-java-gcj rather than nonexistent antlr-gcj (finishing migration started in 2.7.7-8). (Closes: #504050) Modified: trunk/antlr/debian/changelog =================================================================== --- trunk/antlr/debian/changelog 2009-01-15 19:25:39 UTC (rev 7826) +++ trunk/antlr/debian/changelog 2009-01-15 19:44:44 UTC (rev 7827) @@ -2,14 +2,20 @@ [ Torsten Werner ] * Add myself to Uploaders. + * Convert changes to Charscanner.hpp to a patch file. [ Jan Dittberner ] * Fix watch file. (Closes: #511862) * Create a separate package python-antlr. (Closes: #511306) * Add missing build-dependency java-gcj-compat-dev. (Closes: #511849) - -- Torsten Werner <[email protected]> Thu, 15 Jan 2009 20:23:50 +0100 + [ Asheesh Laroia ] + * Fixed cantlr package to depend on libantlr-java-gcj rather than + nonexistent antlr-gcj (finishing migration started in 2.7.7-8). + (Closes: #504050) + -- Torsten Werner <[email protected]> Thu, 15 Jan 2009 20:37:44 +0100 + antlr (2.7.7-9) unstable; urgency=low * libantlr-java{,-gcj}: Fix typos in dependencies. Modified: trunk/antlr/debian/control =================================================================== --- trunk/antlr/debian/control 2009-01-15 19:25:39 UTC (rev 7826) +++ trunk/antlr/debian/control 2009-01-15 19:44:44 UTC (rev 7827) @@ -3,7 +3,7 @@ Priority: optional 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 +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 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/antlr @@ -80,7 +80,7 @@ Package: cantlr Section: devel Architecture: any -Depends: gij, antlr-gcj, ${shlibs:Depends} +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 Added: trunk/antlr/debian/patches/gcc.diff =================================================================== --- trunk/antlr/debian/patches/gcc.diff (rev 0) +++ trunk/antlr/debian/patches/gcc.diff 2009-01-15 19:44:44 UTC (rev 7827) @@ -0,0 +1,10 @@ +--- antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp 2006-11-01 22:37:17.000000000 +0100 ++++ antlr-2.7.7-new/lib/cpp/antlr/CharScanner.hpp 2009-01-15 20:12:28.000000000 +0100 +@@ -17,6 +17,7 @@ + #else + #include <cctype> + #endif ++#include <cstring> + + #if ( _MSC_VER == 1200 ) + // VC6 seems to need this Added: trunk/antlr/debian/patches/series =================================================================== --- trunk/antlr/debian/patches/series (rev 0) +++ trunk/antlr/debian/patches/series 2009-01-15 19:44:44 UTC (rev 7827) @@ -0,0 +1 @@ +gcc.diff Modified: trunk/antlr/debian/rules =================================================================== --- trunk/antlr/debian/rules 2009-01-15 19:25:39 UTC (rev 7826) +++ trunk/antlr/debian/rules 2009-01-15 19:44:44 UTC (rev 7827) @@ -11,7 +11,16 @@ with_native := yes endif -configure: configure-stamp +patch: debian/stamp-patch +debian/stamp-patch: + quilt push -a || test $$? = 2 + touch $@ + +unpatch: + quilt pop -a -R || test $$? = 2 + rm -rf $(CURDIR)/.pc debian/stamp-patch + +configure: patch configure-stamp configure-stamp: dh_testdir cp /usr/share/misc/config.* scripts @@ -39,7 +48,7 @@ $(MAKE) -C lib/cpp touch build-stamp -clean: +clean: unpatch dh_testdir dh_testroot -rm -f build-stamp build-stamp-indep configure-stamp _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
