[pkg-java] r15555 - trunk/antlr/debian

[Matthias Klose]

Author: doko
Date: 2011-12-17 12:10:21 +0000 (Sat, 17 Dec 2011)
New Revision: 15555

Removed:
   trunk/antlr/debian/python-antlr.dirs
Modified:
   trunk/antlr/debian/changelog
   trunk/antlr/debian/control
   trunk/antlr/debian/rules
Log:
antlr (2.7.7+dfsg-3) unstable; urgency=low

  * Team upload.
  * Build using dh_python2.

 -- Matthias Klose <doko at debian.org>  Sat, 17 Dec 2011 11:37:20 +0100


Modified: trunk/antlr/debian/changelog
===================================================================
--- trunk/antlr/debian/changelog	2011-12-17 10:10:40 UTC (rev 15554)
+++ trunk/antlr/debian/changelog	2011-12-17 12:10:21 UTC (rev 15555)
@@ -1,3 +1,10 @@
+antlr (2.7.7+dfsg-3) unstable; urgency=low
+
+  * Team upload.
+  * Build using dh_python2.
+
+ -- Matthias Klose <doko at debian.org>  Sat, 17 Dec 2011 11:37:20 +0100
+
 antlr (2.7.7+dfsg-2) unstable; urgency=low
 
   * Team upload.

Modified: trunk/antlr/debian/control
===================================================================
--- trunk/antlr/debian/control	2011-12-17 10:10:40 UTC (rev 15554)
+++ trunk/antlr/debian/control	2011-12-17 12:10:21 UTC (rev 15555)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 7), default-jdk, 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
+Build-Depends: debhelper (>= 7), default-jdk, python (>= 2.6.6-3~), autotools-dev, python-all-dev (>= 2.3.5-11), sharutils
+Build-Depends-Indep: maven-repo-helper, nant, cli-common-dev (>= 0.7), mono-devel | c-sharp-compiler, libmono-winforms2.0-cil
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/antlr
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/antlr

Deleted: trunk/antlr/debian/python-antlr.dirs
===================================================================
--- trunk/antlr/debian/python-antlr.dirs	2011-12-17 10:10:40 UTC (rev 15554)
+++ trunk/antlr/debian/python-antlr.dirs	2011-12-17 12:10:21 UTC (rev 15555)
@@ -1 +0,0 @@
-usr/share/python-support/antlr

Modified: trunk/antlr/debian/rules
===================================================================
--- trunk/antlr/debian/rules	2011-12-17 10:10:40 UTC (rev 15554)
+++ trunk/antlr/debian/rules	2011-12-17 12:10:21 UTC (rev 15555)
@@ -73,7 +73,9 @@
 	$(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
+	mkdir -p debian/python-antlr/usr/lib/$$(pyversions -d)/dist-packages
+	install -m644 lib/python/antlr/antlr.py \
+		debian/python-antlr/usr/lib/$$(pyversions -d)/dist-packages/.
 	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
 	mh_installpoms -plib$(PACKAGE)-java
@@ -148,7 +150,7 @@
 	# python-antlr
 	dh_installdocs -ppython-antlr
 	dh_installchangelogs -ppython-antlr
-	dh_pysupport -ppython-antlr
+	dh_python2 -ppython-antlr
 	dh_compress -ppython-antlr
 	dh_fixperms -ppython-antlr
 	dh_installdeb -ppython-antlr