[Python-modules-commits] r9784 - in packages/pyside/trunk/debian (4 files)

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

    Date: Wednesday, September 16, 2009 @ 14:27:29
  Author: odyx-guest
Revision: 9784

debian/ cleanup and fix in preparation for the release (really soon now I hope)

Added:
  packages/pyside/trunk/debian/python-pyside-dbg.install
Modified:
  packages/pyside/trunk/debian/patches/multiple_python_versions.patch
  packages/pyside/trunk/debian/patches/series
  packages/pyside/trunk/debian/rules

Modified: packages/pyside/trunk/debian/patches/multiple_python_versions.patch
===================================================================
--- packages/pyside/trunk/debian/patches/multiple_python_versions.patch	2009-09-16 13:51:01 UTC (rev 9783)
+++ packages/pyside/trunk/debian/patches/multiple_python_versions.patch	2009-09-16 14:27:29 UTC (rev 9784)
@@ -1,8 +1,8 @@
 Index: pyside-qt4.5+0.2/CMakeLists.txt
 ===================================================================
---- pyside-qt4.5+0.2.orig/CMakeLists.txt	2009-09-15 16:14:45.000000000 +0200
-+++ pyside-qt4.5+0.2/CMakeLists.txt	2009-09-15 17:01:22.000000000 +0200
-@@ -6,8 +6,45 @@
+--- pyside-qt4.5+0.2.orig/CMakeLists.txt	2009-09-16 14:08:48.000000000 +0000
++++ pyside-qt4.5+0.2/CMakeLists.txt	2009-09-16 14:26:34.000000000 +0000
+@@ -6,8 +6,39 @@
  set(CMAKE_CXX_FLAGS_DEBUG "-g -fno-common -Wall")
  
  find_package(Boost 1.38.0 COMPONENTS python REQUIRED)
@@ -12,12 +12,6 @@
 +if (BUILD_PYTHON)
 +    find_program(PYTHON_EXECUTABLE ${BUILD_PYTHON})
 +    mark_as_advanced(PYTHON_EXECUTABLE)
-+#    execute_process(
-+#        COMMAND
-+#            ${PYTHON_EXECUTABLE} -c "import distutils.sysconfig; print distutils.sysconfig.get_python_inc()"
-+#        OUTPUT_VARIABLE PYTHON_INCLUDE_PATH
-+#        OUTPUT_STRIP_TRAILING_WHITESPACE
-+#        )
 +    execute_process(
 +        COMMAND
 +            ${PYTHON_EXECUTABLE} -c "import sys; v=sys.version_info[:2]; print '%d.%d' % v"

Modified: packages/pyside/trunk/debian/patches/series
===================================================================
--- packages/pyside/trunk/debian/patches/series	2009-09-16 13:51:01 UTC (rev 9783)
+++ packages/pyside/trunk/debian/patches/series	2009-09-16 14:27:29 UTC (rev 9784)
@@ -1,2 +1 @@
 multiple_python_versions.patch
-DEBUG

Added: packages/pyside/trunk/debian/python-pyside-dbg.install
===================================================================
--- packages/pyside/trunk/debian/python-pyside-dbg.install	                        (rev 0)
+++ packages/pyside/trunk/debian/python-pyside-dbg.install	2009-09-16 14:27:29 UTC (rev 9784)
@@ -0,0 +1 @@
+/usr/lib/debug

Modified: packages/pyside/trunk/debian/rules
===================================================================
--- packages/pyside/trunk/debian/rules	2009-09-16 13:51:01 UTC (rev 9783)
+++ packages/pyside/trunk/debian/rules	2009-09-16 14:27:29 UTC (rev 9784)
@@ -4,37 +4,43 @@
 
 # default is first version
 PYVERSIONS=$(shell pyversions -v -r)
-# ALLPY=$(PYVERSIONS:%=%-dbg) $(PYVERSIONS)
-ALLPYY=$(PYVERSIONS)
+ALLPY=$(PYVERSIONS:%=%-dbg) $(PYVERSIONS)
 
 override_dh_auto_configure: $(ALLPY:%=override_dh_auto_configure-%)
 
-# Disable the RPATH propagation for the libraries
+override_dh_auto_configure-%-dbg:
+	mkdir -p build-$*-dbg
+	# Disable the RPATH propagation for the libraries
+	# Use the BUILD_PYTHON variable from patch multiple_python_versions.patch
+	# Additionnally change the install prefix for debug packages
+	dh_auto_configure --builddirectory=build-$*-dbg -- -DBUILD_PYTHON=/usr/bin/python$*-dbg -DCMAKE_INSTALL_PREFIX=/usr/lib/debug/usr
+
 override_dh_auto_configure-%:
 	mkdir -p build-$*
+	# Disable the RPATH propagation for the libraries
+	# Use the BUILD_PYTHON variable from patch multiple_python_versions.patch
 	dh_auto_configure --builddirectory=build-$* -- -DBUILD_PYTHON=/usr/bin/python$* -DCMAKE_SKIP_RPATH=true
 
+
+override_dh_auto_build: $(ALLPY:%=override_dh_auto_build-%)
+
 override_dh_auto_build-%:
 	dh_auto_build --builddirectory=build-$*
 
-override_dh_auto_build: $(ALLPY:%=override_dh_auto_build-%)
 
+override_dh_auto_install: $(ALLPY:%=override_dh_auto_install-%)
+
 override_dh_auto_install-%:
 	dh_auto_install --builddirectory=build-$*
 
+
 override_dh_auto_clean:
 	rm -rf build-*
 
-override_dh_auto_install: $(ALLPY:%=override_dh_auto_install-%)
-
-# Move debug libraries to our -dbg lib
-override_dh_strip:
-	dh_strip --dbg-package=python-pyside-dbg
-
 ## TEMPORARILY DISABLES TESTS (they fail, see bug http://bugs.openbossa.org/show_bug.cgi?id=28)
 override_dh_auto_test:
 	# Don't do anything
 
 %:
-	dh --buildsystem=cmake $@
+	dh --with=quilt --buildsystem=cmake $@