[Python-modules-commits] r19073 - in packages/pyside/trunk/debian (3 files)

[odyx at users.alioth.debian.org]

    Date: Wednesday, October 26, 2011 @ 14:33:21
  Author: odyx
Revision: 19073

Update packaging to 1.0.8:

- Refresh cmake_selectDefaultPython.patch to allow picking a specific python version.
- Make sure the picked pkg-config file is the one for the default python version.
- Update the cmake configuration calls.

Modified:
  packages/pyside/trunk/debian/libpyside-dev.install
  packages/pyside/trunk/debian/patches/cmake_selectDefaultPython.patch
  packages/pyside/trunk/debian/rules

Modified: packages/pyside/trunk/debian/libpyside-dev.install
===================================================================
--- packages/pyside/trunk/debian/libpyside-dev.install	2011-10-26 14:33:12 UTC (rev 19072)
+++ packages/pyside/trunk/debian/libpyside-dev.install	2011-10-26 14:33:21 UTC (rev 19073)
@@ -2,4 +2,3 @@
 usr/share/PySide/typesystems/*
 usr/lib/*/libpyside*.so
 usr/lib/*/cmake/PySide-*/*
-usr/lib/*/pkgconfig/pyside.pc

Modified: packages/pyside/trunk/debian/patches/cmake_selectDefaultPython.patch
===================================================================
--- packages/pyside/trunk/debian/patches/cmake_selectDefaultPython.patch	2011-10-26 14:33:12 UTC (rev 19072)
+++ packages/pyside/trunk/debian/patches/cmake_selectDefaultPython.patch	2011-10-26 14:33:21 UTC (rev 19073)
@@ -11,4 +11,5 @@
 +    message(STATUS "Using default python: @DEFAULT_PYTHON_BASENAME@")
 +    SET(PYTHON_BASENAME @DEFAULT_PYTHON_BASENAME@)
  endif()
- include(@LIB_INSTALL_DIR@/cmake/PySide- at BINDING_API_VERSION@/PySideConfig${SHIBOKEN_PYTHON_SUFFIX}.cmake)
+-include(@LIB_INSTALL_DIR@/cmake/PySide- at BINDING_API_VERSION@/PySideConfig${SHIBOKEN_PYTHON_SUFFIX}.cmake)
++include(@LIB_INSTALL_DIR@/cmake/PySide- at BINDING_API_VERSION@/PySideConfig-${PYTHON_BASENAME}.cmake)

Modified: packages/pyside/trunk/debian/rules
===================================================================
--- packages/pyside/trunk/debian/rules	2011-10-26 14:33:12 UTC (rev 19072)
+++ packages/pyside/trunk/debian/rules	2011-10-26 14:33:21 UTC (rev 19073)
@@ -26,24 +26,22 @@
 	dh_auto_configure -a --builddirectory=build-$*-dbg -- \
 	-DCMAKE_VERBOSE_MAKEFILE=OFF \
 	-DCMAKE_BUILD_TYPE:STRING="Debug" \
+	-DPYTHON_SUFFIX=-python$*-dbg \
 	-DCMAKE_SKIP_RPATH=true \
 	-DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) \
-	-DCMAKE_USE_PYTHON_VERSION="$*-dbg;$*_d;$*" \
 	-DCTEST_TESTING_TIMEOUT=600 \
-	-DUSE_XVFB=true \
-	-DPYTHON_BASENAME=python$*-dbg
+	-DUSE_XVFB=true
 
 override_dh_auto_configure-%:
 	mkdir -p build-$*
 	dh_auto_configure -a --builddirectory=build-$* -- \
 	-DCMAKE_VERBOSE_MAKEFILE=OFF \
 	-DCMAKE_BUILD_TYPE:STRING="Release" \
+	-DPYTHON_SUFFIX=-python$* \
 	-DCMAKE_SKIP_RPATH=true \
 	-DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) \
-	-DCMAKE_USE_PYTHON_VERSION="$*" \
 	-DCTEST_TESTING_TIMEOUT=600 \
 	-DUSE_XVFB=true \
-	-DPYTHON_BASENAME=python$* \
 	-DDEFAULT_PYTHON_BASENAME=python${DEFAULT_PY}
 
 #### BUILD ####
@@ -148,6 +146,9 @@
 	mkdir -p debian/python-pyside-dbg/usr/lib/${DEB_HOST_MULTIARCH}/cmake/`basename debian/libpyside-dev/usr/lib/${DEB_HOST_MULTIARCH}/cmake/PySide-*`
 	rename 's/(debian\/libpyside-dev\/)(.*)-dbg\.cmake/debian\/python-pyside-dbg\/$$2-dbg.cmake/'\
 	              debian/libpyside-dev/usr/lib/${DEB_HOST_MULTIARCH}/cmake/PySide-*/*-dbg.cmake
+	# Make sure the pkg-config is the default's
+	install -D -m 644 build-${DEFAULT_PY}/libpyside/pyside.pc \
+			debian/libpyside-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/pyside.pc
 endif
 
 override_dh_gencontrol: