[Python-modules-commits] r16297 - in packages/pyside/trunk/debian (control rules)

[odyx at users.alioth.debian.org]

    Date: Thursday, March 31, 2011 @ 13:06:18
  Author: odyx
Revision: 16297

Use dh_python2 (hence get the debug files at the correct place).

Modified:
  packages/pyside/trunk/debian/control
  packages/pyside/trunk/debian/rules

Modified: packages/pyside/trunk/debian/control
===================================================================
--- packages/pyside/trunk/debian/control	2011-03-31 13:05:01 UTC (rev 16296)
+++ packages/pyside/trunk/debian/control	2011-03-31 13:06:18 UTC (rev 16297)
@@ -4,7 +4,7 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Didier Raboud <odyx at debian.org>
 Build-Depends: debhelper (>= 7.4.12~), cmake (>= 2.8.2), dpkg-dev (>= 1.15.6),
- python-all-dev (>= 2.3.5-11), python-all-dbg (>= 2.3.5-11), python-support (>= 0.3.9),
+ python-all-dev (>= 2.6.6-3), python-all-dbg (>= 2.6.6-3),
  libqt4-dev (>= 4:4.7.0), libphonon-dev, libqt4-opengl-dev (>= 4:4.7.0), libqtwebkit-dev,
  shiboken (>= 1.0.0), libshiboken-dev (>= 1.0.0), shiboken-dbg (>= 1.0.0),
  generatorrunner (>= 0.6.7), libgenrunner-dev (>= 0.6.7), libapiextractor-dev (>= 0.10.0-2~),
@@ -15,7 +15,7 @@
 # xvfb and xauth are needed to run a fake X Server; libgl1-mesa-dri is needed for the GLX-using tests
 # phonon-backend-gstreamer is needed to test phonon
 Standards-Version: 3.9.1.0
-XS-Python-Version: >= 2.6
+X-Python-Version: >= 2.6
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyside/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pyside/
 Homepage: http://www.pyside.org/

Modified: packages/pyside/trunk/debian/rules
===================================================================
--- packages/pyside/trunk/debian/rules	2011-03-31 13:05:01 UTC (rev 16296)
+++ packages/pyside/trunk/debian/rules	2011-03-31 13:06:18 UTC (rev 16297)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh --buildsystem=cmake --parallel $@
+	dh --with python2 --buildsystem=cmake --parallel $@
 
 # Python versions
 PYVERSIONS=$(shell pyversions -v -r)
@@ -75,14 +75,8 @@
 
 #### STRIP ####
 override_dh_strip:
-ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
 	dh_strip --dbg-package=python-pyside-dbg --exclude=-dbg.so --exclude=_d.so
 	
-	# Rename pyshared to pymodules
-	# (fix python-debug-in-wrong-location lintian warning; see http://wiki.debian.org/Python/DbgBuilds and #576014)
-	cd debian/python-pyside-dbg/usr/lib/debug/usr/lib && mv pyshared pymodules
-endif
-
 #### TEST ####
 override_dh_auto_test: $(PYVERSIONS:%=override_dh_auto_test_dbg-%) $(PYVERSIONS:%=override_dh_auto_test-%)