[pkg-java] r11878 - in trunk/antlr/debian: . source

[Niels Thykier]

Author: nthykier-guest
Date: 2010-03-16 17:11:58 +0000 (Tue, 16 Mar 2010)
New Revision: 11878

Added:
   trunk/antlr/debian/source/
   trunk/antlr/debian/source/format
Modified:
   trunk/antlr/debian/changelog
   trunk/antlr/debian/control
   trunk/antlr/debian/rules
Log:
Converted source to 3.0 (quilt).

Modified: trunk/antlr/debian/changelog
===================================================================
--- trunk/antlr/debian/changelog	2010-03-16 17:02:57 UTC (rev 11877)
+++ trunk/antlr/debian/changelog	2010-03-16 17:11:58 UTC (rev 11878)
@@ -8,6 +8,8 @@
   * Bumped Standards-Version to 3.8.4 - no changes required.
   * Added missing Replace to python-antlr (Closes: #557876)
   * Bumped debhelper compat to 7.
+  * Removed empty dir from the antlr package.
+  * Converted source to 3.0 (quilt).
 
  -- Niels Thykier <niels at thykier.net>  Tue, 16 Mar 2010 17:37:27 +0100
 

Modified: trunk/antlr/debian/control
===================================================================
--- trunk/antlr/debian/control	2010-03-16 17:02:57 UTC (rev 11877)
+++ trunk/antlr/debian/control	2010-03-16 17:11:58 UTC (rev 11878)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 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 (>= 7), default-jdk-builddep, python, autotools-dev, python-all-dev (>= 2.3.5-11), sharutils, quilt
+Build-Depends: debhelper (>= 7), default-jdk-builddep, python, autotools-dev, python-all-dev (>= 2.3.5-11), sharutils
 Build-Depends-Indep: maven-repo-helper, python-support (>= 0.3), nant, cli-common-dev (>= 0.7), mono-devel | c-sharp-compiler, libmono-winforms2.0-cil
 Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/antlr

Modified: trunk/antlr/debian/rules
===================================================================
--- trunk/antlr/debian/rules	2010-03-16 17:02:57 UTC (rev 11877)
+++ trunk/antlr/debian/rules	2010-03-16 17:11:58 UTC (rev 11878)
@@ -3,7 +3,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 export MONO_SHARED_DIR = $(shell pwd)/debian
-export QUILT_PATCHES = debian/patches
 
 include /usr/share/gcj/debian_defaults
 
@@ -15,16 +14,7 @@
   with_native := yes
 endif
 
-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: configure-stamp
 configure-stamp:
 	dh_testdir
 	cp /usr/share/misc/config.* scripts
@@ -53,7 +43,7 @@
 	$(MAKE) -C lib/cpp
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	-rm -f build-stamp build-stamp-indep configure-stamp
@@ -85,6 +75,7 @@
 	dh_link -i
 	$(MAKE) -f debian/Makefile.debian install DESTDIR=`pwd`/debian/antlr
 	mv debian/antlr/usr/share/java/* debian/libantlr-java/usr/share/java/
+	rmdir debian/antlr/usr/share/java/
 	install -m644 lib/python/antlr/antlr.py debian/python-antlr/usr/share/python-support/antlr
 	install -m644 -D CHANGES.txt debian/antlr/usr/share/doc/antlr/changelog
 	install -m644 -D CHANGES.txt debian/antlr-doc/usr/share/doc/antlr-doc/changelog

Added: trunk/antlr/debian/source/format
===================================================================
--- trunk/antlr/debian/source/format	                        (rev 0)
+++ trunk/antlr/debian/source/format	2010-03-16 17:11:58 UTC (rev 11878)
@@ -0,0 +1 @@
+3.0 (quilt)