[Python-modules-commits] r8316 - in packages/sip4-qt3/trunk/debian (5 files)

Mon Apr 27 22:00:25 UTC 2009

Date: Monday, April 27, 2009 @ 22:00:24
  Author: bzed
Revision: 8316

* Fixing override disparity: Set 'debug' as sectiong for the -dbg package.
* Bumping Standards-Version to 3.8.1, no changes needed.
* Migrating to python-support.
* Merging changes from Ubuntu to build for Python 2.6. We
  don't use python-central stuff, though. 

Added:
  packages/sip4-qt3/trunk/debian/pyversions
Modified:
  packages/sip4-qt3/trunk/debian/changelog
  packages/sip4-qt3/trunk/debian/control
  packages/sip4-qt3/trunk/debian/python-sip4.install
  packages/sip4-qt3/trunk/debian/rules

Modified: packages/sip4-qt3/trunk/debian/changelog
===================================================================

--- packages/sip4-qt3/trunk/debian/changelog	2009-04-27 21:34:12 UTC (rev 8315)
+++ packages/sip4-qt3/trunk/debian/changelog	2009-04-27 22:00:24 UTC (rev 8316)
@@ -1,10 +1,13 @@
 sip4-qt3 (4.7.9-3) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
-  * debian/control: Fixing override disparity: Set 'debug'
-    as sectiong for the -dbg package.
+  * Fixing override disparity: Set 'debug' as sectiong for the -dbg package.
+  * Bumping Standards-Version to 3.8.1, no changes needed.
+  * Migrating to python-support.
+  * Merging changes from Ubuntu to build for Python 2.6. We
+    don't use python-central stuff, though. 
 
- -- Bernd Zeimetz <bzed at debian.org>  Sun, 05 Apr 2009 21:36:14 +0200
+ -- Bernd Zeimetz <bzed at debian.org>  Mon, 27 Apr 2009 23:56:20 +0200
 
 sip4-qt3 (4.7.9-2) unstable; urgency=low
 

Modified: packages/sip4-qt3/trunk/debian/control
===================================================================
--- packages/sip4-qt3/trunk/debian/control	2009-04-27 21:34:12 UTC (rev 8315)
+++ packages/sip4-qt3/trunk/debian/control	2009-04-27 22:00:24 UTC (rev 8316)
@@ -3,9 +3,8 @@
 Priority: optional
 Maintainer: Ricardo Javier Cardenes Medina <rcardenes at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>, Torsten Marek <shlomme at debian.org>, Bernd Zeimetz <bzed at debian.org>
-Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-10), python-all-dbg, python-central (>= 0.5.8), dpatch
-XS-Python-Version: all
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1), dpatch
+Standards-Version: 3.8.1
 Homepage: http://www.riverbankcomputing.co.uk/software/sip/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/sip4-qt3/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/sip4-qt3/trunk/
@@ -41,7 +40,6 @@
 Section: python
 Provides: ${python:Provides}
 Depends: ${python:Depends}, ${shlibs:Depends}
-XB-Python-Version: ${python:Versions}
 Description: Python/C++ bindings generator runtime library
  SIP is a tool for generating bindings for C++ classes with some ideas
  borrowed from SWIG, but capable of tighter bindings because of its
@@ -53,7 +51,6 @@
 Section: debug
 Provides: ${python:Provides}
 Depends: python-sip4 (= ${binary:Version}), python-dbg, ${shlibs:Depends}
-XB-Python-Version: ${python:Versions}
 Description: Python/C++ bindings generator runtime library (debug extension)
  SIP is a tool for generating bindings for C++ classes with some ideas
  borrowed from SWIG, but capable of tighter bindings because of its
@@ -67,7 +64,6 @@
 Depends: ${python:Depends}, python-dev
 Replaces: python-sip4 (<< 4.7)
 Recommends: python-sip4 (>= ${source:Version})
-XB-Python-Version: ${python:Versions}
 Description: Python/C++ bindings generator development files
  SIP is a tool for generating bindings for C++ classes with some ideas
  borrowed from SWIG, but capable of tighter bindings because of its

Modified: packages/sip4-qt3/trunk/debian/python-sip4.install
===================================================================
--- packages/sip4-qt3/trunk/debian/python-sip4.install	2009-04-27 21:34:12 UTC (rev 8315)
+++ packages/sip4-qt3/trunk/debian/python-sip4.install	2009-04-27 22:00:24 UTC (rev 8316)
@@ -1 +1 @@
-usr/lib/python*/site-packages/sip.so
+usr/lib/python*/*-packages/sip.so

Added: packages/sip4-qt3/trunk/debian/pyversions
===================================================================
--- packages/sip4-qt3/trunk/debian/pyversions	                        (rev 0)
+++ packages/sip4-qt3/trunk/debian/pyversions	2009-04-27 22:00:24 UTC (rev 8316)
@@ -0,0 +1 @@
+2.3-

Modified: packages/sip4-qt3/trunk/debian/rules
===================================================================
--- packages/sip4-qt3/trunk/debian/rules	2009-04-27 21:34:12 UTC (rev 8315)
+++ packages/sip4-qt3/trunk/debian/rules	2009-04-27 22:00:24 UTC (rev 8316)
@@ -18,6 +18,15 @@
 
 PYTHONS	:= $(shell pyversions -vr debian/control)
 
+-include /usr/share/python/python.mk
+ifeq (,$(py_sitename))
+py_sitename = site-packages
+py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
+py_sitename_sh = $(py_sitename)
+py_libdir_sh = $(py_libdir)
+endif
+
+
 .PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
 
 configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
@@ -27,6 +36,7 @@
 	mkdir -p build-$*
 	cd build-$* \
 		&& python$* ../configure.py \
+			-d /usr/lib/python$*/$(call py_sitename,$*) \
 			-u STRIP="" CFLAGS="${CFLAGS}" CFLAGS_RELEASE="" CXXFLAGS="${CFLAGS}" CXXFLAGS_RELEASE=""
 	touch $@
 
@@ -35,6 +45,7 @@
 	mkdir -p dbg-build-$*
 	cd dbg-build-$* \
 		&& python$*-dbg ../configure.py \
+			-d /usr/lib/python$*/$(call py_sitename,$*) \
 			-e /usr/include/python$*_d \
 			-u CFLAGS="-O0 -g" CFLAGS_RELEASE="" CXXFLAGS="-O0 -g" CXXFLAGS_RELEASE="" STRIP=""
 	touch $@
@@ -59,25 +70,27 @@
 	rm -rf *-stamp siputils.pyc $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%)
 	dh_clean
 
-install-indep: configure
+install-indep: configure install-indep-pre $(PYTHONS:%=install-indep-%)
+	dh_install -i
+
+install-indep-pre:
 	dh_testdir
 	dh_testroot
 	dh_clean -k -i
 	dh_installdirs -i
-	for version in ${PYTHONS}; do \
-		mkdir -p debian/python-sip4-dev/usr/include/python$$version; \
-		install -m 644 -o root -g root siplib/sip.h debian/python-sip4-dev/usr/include/python$$version/; \
-		mkdir -p debian/python-sip4-dev/usr/include/python$${version}_d; \
-		ln -s ../python$$version/sip.h \
-		    debian/python-sip4-dev/usr/include/python$${version}_d/sip.h; \
-		mkdir -p debian/python-sip4-dev/usr/lib/python$$version/site-packages; \
-	  	install -m 644 -o root -g root debian/sipconfig.py debian/python-sip4-dev/usr/lib/python$$version/site-packages/; \
-		install -m 644 -o root -g root sipdistutils.py debian/python-sip4-dev/usr/lib/python$$version/site-packages;\
-		install -m 644 -o root -g root build-$$version/sipconfig.py debian/python-sip4-dev/usr/lib/python$$version/site-packages/sipconfig_nd.py;\
-		install -m 644 -o root -g root dbg-build-$$version/sipconfig.py debian/python-sip4-dev/usr/lib/python$$version/site-packages/sipconfig_d.py;\
-	done
-	dh_install -i
 
+install-indep-%:
+	mkdir -p debian/python-sip4-dev/usr/include/python$*
+	install -m 644 -o root -g root siplib/sip.h debian/python-sip4-dev/usr/include/python$*/
+	mkdir -p debian/python-sip4-dev/usr/include/python$*_d
+	ln -s ../python$*/sip.h \
+	    debian/python-sip4-dev/usr/include/python$*_d/sip.h
+	mkdir -p debian/python-sip4-dev/usr/lib/python$*/$(call py_sitename,$*)
+	install -m 644 -o root -g root debian/sipconfig.py debian/python-sip4-dev/usr/lib/python$*/$(call py_sitename,$*)/
+	install -m 644 -o root -g root sipdistutils.py debian/python-sip4-dev/usr/lib/python$*/$(call py_sitename,$*)
+	install -m 644 -o root -g root build-$*/sipconfig.py debian/python-sip4-dev/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_nd.py
+	install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip4-dev/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_d.py
+
 install-arch: build 
 	dh_testdir
 	dh_testroot
@@ -124,7 +137,7 @@
 endif
 	dh_compress 
 	dh_fixperms
-	DH_PYCENTRAL=nomove dh_pycentral
+	dh_pysupport
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol


