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

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

    Date: Monday, February 14, 2011 @ 16:51:02
  Author: odyx-guest
Revision: 15690

Patches: add allowMultiplePySideVersions.patch to allow the selection of the desired python flavour

Added:
  packages/pyside/trunk/debian/patches/allowMultiplePySideVersions.patch
Modified:
  packages/pyside/trunk/debian/patches/series
  packages/pyside/trunk/debian/rules

Added: packages/pyside/trunk/debian/patches/allowMultiplePySideVersions.patch
===================================================================
--- packages/pyside/trunk/debian/patches/allowMultiplePySideVersions.patch	                        (rev 0)
+++ packages/pyside/trunk/debian/patches/allowMultiplePySideVersions.patch	2011-02-14 16:51:02 UTC (rev 15690)
@@ -0,0 +1,41 @@
+Description: Allow to specify the postfix when looking for pyside.
+Author: Didier Raboud <didier at raboud.com>
+Origin: vendor
+Forwarded: not needed (distribution specific)
+Last-Update: 2010-12-02
+--- a/libpyside/CMakeLists.txt
++++ b/libpyside/CMakeLists.txt
+@@ -58,7 +58,8 @@
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pyside.pc.in"
+                "${CMAKE_CURRENT_BINARY_DIR}/pyside${pyside_SUFFIX}.pc" @ONLY)
+ # create cmake-config files
+-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySideConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/PySideConfig.cmake" @ONLY)
++configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySideConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/PySideConfig${LIBRARY_OUTPUT_SUFFIX}.cmake" @ONLY)
++configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySideConfig-indep.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/PySideConfig.cmake" @ONLY)
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySideConfigVersion.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/PySideConfigVersion.cmake" @ONLY)
+ 
+ install(FILES ${libpyside_HEADERS}
+@@ -70,6 +71,8 @@
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pyside${pyside_SUFFIX}.pc" DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySideConfig.cmake"
+         DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide-${BINDING_API_VERSION}")
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySideConfig${LIBRARY_OUTPUT_SUFFIX}.cmake"
++        DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide-${BINDING_API_VERSION}")
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySideConfigVersion.cmake"
+         DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide-${BINDING_API_VERSION}")
+ 
+--- /dev/null
++++ b/libpyside/PySideConfig-indep.cmake.in
+@@ -0,0 +1,12 @@
++#  PYSIDE_INCLUDE_DIR   - Directories to include to use PySide
++#  PYSIDE_LIBRARY       - Files to link against to use PySide
++#  PYSIDE_PYTHONPATH    - Path to where the PySide Python module files could be found
++#  PYSIDE_TYPESYSTEMS   - Type system files that should be used by other bindings extending PySide
++
++#  Parameters:
++#  PYSIDE_POSTFIX       - Specific postfix
++#                           (e.g. -py26   for the python 2.6 specific version;
++#                                 -py26_d for the python 2.6 with -DPy_DEBUG specific version )
++
++SET(PYSIDE_POSTFIX @DEFAULT_PYSIDE_POSTFIX@ CACHE STRING "Python specific pyside postfix (e.g. @DEFAULT_PYSIDE_POSTFIX@ for the default python version)")
++INCLUDE(@LIB_INSTALL_DIR@/cmake/PySide- at BINDING_API_VERSION@/PySideConfig${PYSIDE_POSTFIX}.cmake)

Modified: packages/pyside/trunk/debian/patches/series
===================================================================
--- packages/pyside/trunk/debian/patches/series	2011-02-14 16:50:53 UTC (rev 15689)
+++ packages/pyside/trunk/debian/patches/series	2011-02-14 16:51:02 UTC (rev 15690)
@@ -2,3 +2,4 @@
 libPythonVersionPostfix.patch
 usePySpecificShiboken.patch
 lessBuildVerbosity.patch
+allowMultiplePySideVersions.patch

Modified: packages/pyside/trunk/debian/rules
===================================================================
--- packages/pyside/trunk/debian/rules	2011-02-14 16:50:53 UTC (rev 15689)
+++ packages/pyside/trunk/debian/rules	2011-02-14 16:51:02 UTC (rev 15690)
@@ -32,6 +32,7 @@
 	-DCMAKE_SKIP_RPATH=true \
 	-DCMAKE_USE_PYTHON_VERSION="$*" \
 	-DUSE_XVFB=true \
+	-DDEFAULT_PYSIDE_POSTFIX=$(shell echo -py${DEFAULT_PY} | sed -e 's/\.//g' -) \
 	-DLIBPYSIDE_POSTFIX=$(shell echo -py$* | sed -e 's/\.//g' -) \
 	-DSHIBOKEN_POSTFIX=$(shell echo -py$* | sed -e 's/\.//g' -)
 
@@ -97,6 +98,9 @@
 	# Move the debug library to the correct package.
 	$(shell rename 's/(debian\/libpyside${LIBPYSIDE_SOVERSION}\/)(.*)_d\.so(.*)$$/debian\/python-pyside-dbg\/$$2_d.so$$3/' \
 	              debian/libpyside${LIBPYSIDE_SOVERSION}/usr/lib/*_d.so*)
+	# Move the debug cmake files to the correct package
+	$(shell rename 's/(debian\/libpyside-dev\/)(.*)_d\.cmake/debian\/python-pyside-dbg\/$$2_d.cmake/'\
+	              debian/tmp-dbg/usr/lib/cmake/PySide-*/*_d.cmake)
 
 override_dh_gencontrol:
 	debian/dh_pycmakedeps --modules-root=PySide/