[Python-modules-commits] r19060 - in packages/shiboken/trunk/debian (5 files)

[odyx at users.alioth.debian.org]

    Date: Wednesday, October 26, 2011 @ 09:17:05
  Author: odyx
Revision: 19060

Update packaging to 1.0.9:

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

Added:
  packages/shiboken/trunk/debian/patches/pythonversionindep.patch
Modified:
  packages/shiboken/trunk/debian/libshiboken-dev.install
  packages/shiboken/trunk/debian/patches/cmake_selectDefaultPython.patch
  packages/shiboken/trunk/debian/patches/series
  packages/shiboken/trunk/debian/rules

Modified: packages/shiboken/trunk/debian/libshiboken-dev.install
===================================================================
--- packages/shiboken/trunk/debian/libshiboken-dev.install	2011-10-26 09:16:54 UTC (rev 19059)
+++ packages/shiboken/trunk/debian/libshiboken-dev.install	2011-10-26 09:17:05 UTC (rev 19060)
@@ -1,4 +1,3 @@
 usr/include/*
 usr/lib/*/*.so
-usr/lib/*/pkgconfig/*
 usr/lib/*/cmake/*

Modified: packages/shiboken/trunk/debian/patches/cmake_selectDefaultPython.patch
===================================================================
--- packages/shiboken/trunk/debian/patches/cmake_selectDefaultPython.patch	2011-10-26 09:16:54 UTC (rev 19059)
+++ packages/shiboken/trunk/debian/patches/cmake_selectDefaultPython.patch	2011-10-26 09:17:05 UTC (rev 19060)
@@ -1,14 +1,14 @@
 Description: Use the _default_ Python version as fallback default.
 Author: Didier Raboud <odyx at debian.org>
 Origin: vendor
-Last-Update: 2010-01-24
+Last-Update: 2011-10-25
 --- a/data/ShibokenConfig.cmake.in
 +++ b/data/ShibokenConfig.cmake.in
 @@ -1,5 +1,5 @@
- if (NOT PYTHON_BASENAME)
--    message(STATUS "Using default python: @PYTHON_BASENAME@")
--    SET(PYTHON_BASENAME @PYTHON_BASENAME@)
-+    message(STATUS "Using default python: @DEFAULT_PYTHON_BASENAME@")
-+    SET(PYTHON_BASENAME @DEFAULT_PYTHON_BASENAME@)
+ if (NOT PYTHON_SUFFIX)
+-    message(STATUS "Using default python: @PYTHON_SUFFIX@")
+-    SET(PYTHON_SUFFIX @PYTHON_SUFFIX@)
++    message(STATUS "Using default python: @DEFAULT_PYTHON_SUFFIX@")
++    SET(PYTHON_SUFFIX @DEFAULT_PYTHON_SUFFIX@)
  endif()
- include(@LIB_INSTALL_DIR@/cmake/Shiboken- at shiboken_VERSION@/ShibokenConfig-${PYTHON_BASENAME}.cmake)
+ include(@LIB_INSTALL_DIR@/cmake/Shiboken- at shiboken_VERSION@/ShibokenConfig${PYTHON_SUFFIX}.cmake)

Added: packages/shiboken/trunk/debian/patches/pythonversionindep.patch
===================================================================
--- packages/shiboken/trunk/debian/patches/pythonversionindep.patch	                        (rev 0)
+++ packages/shiboken/trunk/debian/patches/pythonversionindep.patch	2011-10-26 09:17:05 UTC (rev 19060)
@@ -0,0 +1,22 @@
+Description: Allow the packaging definitions to pick the desired python version.
+Author: Didier Raboud <odyx at debian.org>
+Last-Update: 2011-10-25
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -31,7 +31,7 @@
+     set(PYTHONINTERP_FOUND ${PYTHON3INTERP_FOUND})
+     set(PYTHON_EXECUTABLE ${PYTHON3_EXECUTABLE})
+ else()
+-    find_package(PythonLibs 2.6)
++    find_package(PythonLibs)
+     find_package(PythonInterpWithDebug)
+ endif()
+ 
+--- a/cmake/Modules/FindPythonInterpWithDebug.cmake
++++ b/cmake/Modules/FindPythonInterpWithDebug.cmake
+@@ -1,4 +1,4 @@
+-find_program(PYTHON_EXECUTABLE NAMES python2.7 python2.6 python2.5)
++# find_program(PYTHON_EXECUTABLE NAMES python2.7 python2.6 python2.5)
+ 
+ if(NOT PYTHON_EXECUTABLE)
+     find_package(PythonInterp REQUIRED)

Modified: packages/shiboken/trunk/debian/patches/series
===================================================================
--- packages/shiboken/trunk/debian/patches/series	2011-10-26 09:16:54 UTC (rev 19059)
+++ packages/shiboken/trunk/debian/patches/series	2011-10-26 09:17:05 UTC (rev 19060)
@@ -1 +1,2 @@
 cmake_selectDefaultPython.patch
+pythonversionindep.patch

Modified: packages/shiboken/trunk/debian/rules
===================================================================
--- packages/shiboken/trunk/debian/rules	2011-10-26 09:16:54 UTC (rev 19059)
+++ packages/shiboken/trunk/debian/rules	2011-10-26 09:17:05 UTC (rev 19060)
@@ -23,8 +23,10 @@
 	-DCMAKE_BUILD_TYPE:STRING="Debug" \
 	-DCMAKE_SKIP_RPATH=true \
 	-DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) \
+	-DPYTHON_SUFFIX=-python$*-dbg \
 	-DCMAKE_USE_PYTHON_VERSION="$*-dbg;$*_d;$*" \
-	-DPython_ADDITIONAL_VERSIONS="$*-dbg;$*_d;$*"
+	-DPython_ADDITIONAL_VERSIONS="$*-dbg;$*_d;$*" \
+	-DPYTHON_EXECUTABLE=/usr/bin/python$*-dbg
 
 override_dh_auto_configure-%:
 	mkdir -p build-$*
@@ -32,9 +34,11 @@
 	-DCMAKE_BUILD_TYPE:STRING="Release" \
 	-DCMAKE_SKIP_RPATH=true \
 	-DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) \
+	-DPYTHON_SUFFIX=-python$* \
 	-DCMAKE_USE_PYTHON_VERSION=$* \
 	-DPython_ADDITIONAL_VERSIONS=$* \
-	-DDEFAULT_PYTHON_BASENAME=python${DEFAULT_PY}
+	-DPYTHON_EXECUTABLE=/usr/bin/python$* \
+	-DDEFAULT_PYTHON_SUFFIX=-python${DEFAULT_PY}
 
 #### BUILD ####
 
@@ -95,6 +99,9 @@
 	# Setup the default version symbolic links
 	ln -sf libshiboken-python${DEFAULT_PY}.so \
 	               debian/libshiboken-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libshiboken.so
+	# Make sure the pkg-config is the default's
+	install -D -m 644 build-${DEFAULT_PY}/data/shiboken.pc \
+			debian/libshiboken-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/shiboken.pc
 endif
 ifneq (,$(filter shiboken-dbg, $(shell dh_listpackages)))
 	ln -sf libshiboken-python${DEFAULT_PY}-dbg.so \