[Python-apps-commits] r3029 - in packages/pkpgcounter/trunk/debian (changelog control rules)

[gilir-guest at users.alioth.debian.org]

    Date: Sunday, May 31, 2009 @ 16:51:20
  Author: gilir-guest
Revision: 3029

Merge Ubuntu changes for Python 2.6 transition

Modified:
  packages/pkpgcounter/trunk/debian/changelog
  packages/pkpgcounter/trunk/debian/control
  packages/pkpgcounter/trunk/debian/rules

Modified: packages/pkpgcounter/trunk/debian/changelog
===================================================================
--- packages/pkpgcounter/trunk/debian/changelog	2009-05-31 13:57:54 UTC (rev 3028)
+++ packages/pkpgcounter/trunk/debian/changelog	2009-05-31 16:51:20 UTC (rev 3029)
@@ -1,3 +1,14 @@
+pkpgcounter (3.50-5) UNRELEASED; urgency=low
+
+  * From Ubuntu, prepare for the future python transition:
+   - debian/rules: 
+    + Include /usr/share/python/python.mk
+    + Add $(py_setup_install_args) to setup.py install
+   - debian/control: 
+    + Bump build-depends to python (>= 2.5.4-1~)
+
+ -- Julien Lavergne <julien.lavergne at gmail.com>  Sun, 31 May 2009 18:23:31 +0200
+
 pkpgcounter (3.50-4) unstable; urgency=low
 
   * debian/control:

Modified: packages/pkpgcounter/trunk/debian/control
===================================================================
--- packages/pkpgcounter/trunk/debian/control	2009-05-31 13:57:54 UTC (rev 3028)
+++ packages/pkpgcounter/trunk/debian/control	2009-05-31 16:51:20 UTC (rev 3029)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: Kumar Appaiah <akumar at debian.org>, Jerome Alet <alet at librelogiciel.com>
-Build-Depends-Indep: python, python-central (>= 0.5), python-imaging
+Build-Depends-Indep: python (>= 2.5.4-1~), python-central (>= 0.5), python-imaging
 Build-Depends: debhelper (>= 5.0.37.3), quilt
 Standards-Version: 3.8.0
 XS-Python-Version: current

Modified: packages/pkpgcounter/trunk/debian/rules
===================================================================
--- packages/pkpgcounter/trunk/debian/rules	2009-05-31 13:57:54 UTC (rev 3028)
+++ packages/pkpgcounter/trunk/debian/rules	2009-05-31 16:51:20 UTC (rev 3029)
@@ -6,6 +6,7 @@
 PYTHON=$(shell pyversions -r)
 
 include /usr/share/quilt/quilt.make
+include /usr/share/python/python.mk
 
 build: build-stamp
 
@@ -27,7 +28,7 @@
 install-$(PYTHON):
 	dh_testdir
 	dh_testroot
-	$(PYTHON) setup.py install --root `pwd`/debian/pkpgcounter/
+	$(PYTHON) setup.py install --root `pwd`/debian/pkpgcounter/ $(py_setup_install_args)
 	find ./debian/pkpgcounter/usr/lib -name '*\.py' | xargs sed -i -e '1 s|^#\!.*python.*||'
 	sed -i -e '1 s|^#\!.*python.*|#!/usr/bin/python|' ./debian/pkpgcounter/usr/bin/pkpgcounter
 	rm ./debian/pkpgcounter/usr/share/doc/pkpgcounter/COPYING