[Python-modules-commits] r8725 - in packages/python-kinterbasdb/trunk/debian (3 files)

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

    Date: Thursday, June 4, 2009 @ 23:12:40
  Author: gilir-guest
Revision: 8725

Merge Ubuntu changes for Python 2.6 transition

Modified:
  packages/python-kinterbasdb/trunk/debian/changelog
  packages/python-kinterbasdb/trunk/debian/control
  packages/python-kinterbasdb/trunk/debian/rules

Modified: packages/python-kinterbasdb/trunk/debian/changelog
===================================================================
--- packages/python-kinterbasdb/trunk/debian/changelog	2009-06-04 23:10:23 UTC (rev 8724)
+++ packages/python-kinterbasdb/trunk/debian/changelog	2009-06-04 23:12:40 UTC (rev 8725)
@@ -1,10 +1,20 @@
 python-kinterbasdb (3.2-4) UNRELEASED; urgency=low
 
+  [ Sandro Tosi ]
   * debian/control
     - switch Vcs-Browser field to viewsvn
 
- -- Sandro Tosi <morph at debian.org>  Mon, 03 Nov 2008 22:15:24 +0100
+  [ Julien Lavergne ]
+  * 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
+    + Replace site-packages by *-packages
+   - debian/control: 
+    + Bump build-depends to python-all-dev (>= 2.5.4-1~)
 
+ -- Julien Lavergne <julien.lavergne at gmail.com>  Sun, 31 May 2009 20:03:42 +0200
+
 python-kinterbasdb (3.2-3) unstable; urgency=low
 
   * debian/control

Modified: packages/python-kinterbasdb/trunk/debian/control
===================================================================
--- packages/python-kinterbasdb/trunk/debian/control	2009-06-04 23:10:23 UTC (rev 8724)
+++ packages/python-kinterbasdb/trunk/debian/control	2009-06-04 23:12:40 UTC (rev 8725)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Sandro Tosi <morph at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), firebird2.0-dev, python-all-dev (>= 2.3.5-11), python-egenix-mx-base-dev, python-support (>= 0.6.4), dpatch, python-all-dbg (>= 2.4.4-6)
+Build-Depends: debhelper (>= 5.0.37.2), firebird2.0-dev, python-all-dev (>= 2.5.4-1~), python-egenix-mx-base-dev, python-support (>= 0.6.4), dpatch, python-all-dbg (>= 2.4.4-6)
 Standards-Version: 3.7.3
 Homepage: http://kinterbasdb.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-kinterbasdb/trunk/

Modified: packages/python-kinterbasdb/trunk/debian/rules
===================================================================
--- packages/python-kinterbasdb/trunk/debian/rules	2009-06-04 23:10:23 UTC (rev 8724)
+++ packages/python-kinterbasdb/trunk/debian/rules	2009-06-04 23:12:40 UTC (rev 8725)
@@ -6,6 +6,7 @@
 #export DH_VERBOSE=1
 
 include /usr/share/dpatch/dpatch.make
+include /usr/share/python/python.mk
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
@@ -47,15 +48,15 @@
 
 	set -e; \
 	for py in $(PYVERS); do \
-	    $$py setup.py install --root=debian/python-kinterbasdb; \
-	    $$py-dbg setup.py install --root=debian/python-kinterbasdb-dbg; \
+	    $$py setup.py install --root=debian/python-kinterbasdb $(py_setup_install_args); \
+	    $$py-dbg setup.py install --root=debian/python-kinterbasdb-dbg $(py_setup_install_args); \
 	done
 
 	-find debian -name '*.py[co]' | xargs rm -f
 
 	# these are wrongly installed by the script above:
-	rm -rf debian/python-kinterbasdb/usr/lib/python*/site-packages/kinterbasdb/docs
-	rm -rf debian/python-kinterbasdb-dbg/usr/lib/python*/site-packages/kinterbasdb/docs
+	rm -rf debian/python-kinterbasdb/usr/lib/python*/*-packages/kinterbasdb/docs
+	rm -rf debian/python-kinterbasdb-dbg/usr/lib/python*/*-packages/kinterbasdb/docs
 
 	# remove things not needed in a debug package
 	find debian/python-kinterbasdb-dbg ! -type d ! -name '*_d.so' | xargs rm -f