[Python-modules-commits] r10822 - in packages/pyside/trunk/debian (6 files)

odyx-guest at users.alioth.debian.org odyx-guest at users.alioth.debian.org
Fri Dec 18 13:41:19 UTC 2009 

    Date: Friday, December 18, 2009 @ 13:41:17
  Author: odyx-guest
Revision: 10822

Big Update (Add 2 patches and make the debug build "work")

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

Modified: packages/pyside/trunk/debian/changelog
===================================================================
--- packages/pyside/trunk/debian/changelog	2009-12-18 13:32:11 UTC (rev 10821)
+++ packages/pyside/trunk/debian/changelog	2009-12-18 13:41:17 UTC (rev 10822)
@@ -14,7 +14,10 @@
       python-pyside.qt$module to fit with Debian Python Policy.
   * debian/rules: Add tweaks to get multiple python versions built.
     - It does not build on python 2.4, but is ready for 2.6.
-  * debian/patches/multiple_python_versions.patch: Add
+  * debian/patches: 
+    - multiple_python_versions.patch: Add
+    - use_cmake_no_config.patch     : Add
+    - debug_build_add_postfix.patch : Add
   * debian/watch: Add.
   * Bump Standards to 3.8.3 - No changes needed.
 

Added: packages/pyside/trunk/debian/patches/debug_build_add_postfix.patch
===================================================================
--- packages/pyside/trunk/debian/patches/debug_build_add_postfix.patch	                        (rev 0)
+++ packages/pyside/trunk/debian/patches/debug_build_add_postfix.patch	2009-12-18 13:41:17 UTC (rev 10822)
@@ -0,0 +1,183 @@
+Description: Correctly installs the *_d.so files by adding the configured prefix
+Author: Didier Raboud <didier at raboud.com>
+Last-Update: 2009-12-18
+Origin: vendor
+Index: pyside-0.2.2/PySide/QtCore/CMakeLists.txt
+===================================================================
+--- pyside-0.2.2.orig/PySide/QtCore/CMakeLists.txt	2009-12-18 13:54:01.000000000 +0100
++++ pyside-0.2.2/PySide/QtCore/CMakeLists.txt	2009-12-18 14:07:13.000000000 +0100
+@@ -148,6 +148,6 @@
+                       pysidebase)
+ 
+ # install
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtCore.so
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtCore${CMAKE_DEBUG_POSTFIX}.so
+         DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
+ 
+Index: pyside-0.2.2/PySide/QtGui/CMakeLists.txt
+===================================================================
+--- pyside-0.2.2.orig/PySide/QtGui/CMakeLists.txt	2009-12-18 14:06:35.000000000 +0100
++++ pyside-0.2.2/PySide/QtGui/CMakeLists.txt	2009-12-18 14:07:33.000000000 +0100
+@@ -808,6 +808,6 @@
+ endif(CMAKE_HOST_UNIX)
+ 
+ 
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtGui.so
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtGui${CMAKE_DEBUG_POSTFIX}.so
+         DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
+ 
+Index: pyside-0.2.2/PySide/QtHelp/CMakeLists.txt
+===================================================================
+--- pyside-0.2.2.orig/PySide/QtHelp/CMakeLists.txt	2009-12-18 14:06:35.000000000 +0100
++++ pyside-0.2.2/PySide/QtHelp/CMakeLists.txt	2009-12-18 14:07:42.000000000 +0100
+@@ -43,7 +43,7 @@
+                       pysidebase)
+ 
+ # install
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtHelp.so
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtHelp${CMAKE_DEBUG_POSTFIX}.so
+         DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
+ 
+ 
+Index: pyside-0.2.2/PySide/QtMultimedia/CMakeLists.txt
+===================================================================
+--- pyside-0.2.2.orig/PySide/QtMultimedia/CMakeLists.txt	2009-12-18 14:06:35.000000000 +0100
++++ pyside-0.2.2/PySide/QtMultimedia/CMakeLists.txt	2009-12-18 14:07:49.000000000 +0100
+@@ -43,5 +43,5 @@
+                       pysidebase)
+ 
+ # install
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtMultimedia.so
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtMultimedia${CMAKE_DEBUG_POSTFIX}.so
+         DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
+Index: pyside-0.2.2/PySide/QtNetwork/CMakeLists.txt
+===================================================================
+--- pyside-0.2.2.orig/PySide/QtNetwork/CMakeLists.txt	2009-12-18 14:06:35.000000000 +0100
++++ pyside-0.2.2/PySide/QtNetwork/CMakeLists.txt	2009-12-18 14:07:58.000000000 +0100
+@@ -91,6 +91,6 @@
+                       pysidebase)
+ 
+ # install
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtNetwork.so
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtNetwork${CMAKE_DEBUG_POSTFIX}.so
+         DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
+ 
+Index: pyside-0.2.2/PySide/QtOpenGL/CMakeLists.txt
+===================================================================
+--- pyside-0.2.2.orig/PySide/QtOpenGL/CMakeLists.txt	2009-12-18 14:06:35.000000000 +0100
++++ pyside-0.2.2/PySide/QtOpenGL/CMakeLists.txt	2009-12-18 14:08:07.000000000 +0100
+@@ -48,6 +48,6 @@
+                       pysidebase)
+ 
+ # install
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtOpenGL.so
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtOpenGL${CMAKE_DEBUG_POSTFIX}.so
+         DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
+ 
+Index: pyside-0.2.2/PySide/QtScript/CMakeLists.txt
+===================================================================
+--- pyside-0.2.2.orig/PySide/QtScript/CMakeLists.txt	2009-12-18 14:06:35.000000000 +0100
++++ pyside-0.2.2/PySide/QtScript/CMakeLists.txt	2009-12-18 14:08:13.000000000 +0100
+@@ -39,7 +39,7 @@
+                       pysidebase)
+ 
+ # install
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtScript.so
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtScript${CMAKE_DEBUG_POSTFIX}.so
+         DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
+ 
+ 
+Index: pyside-0.2.2/PySide/QtScriptTools/CMakeLists.txt
+===================================================================
+--- pyside-0.2.2.orig/PySide/QtScriptTools/CMakeLists.txt	2009-12-18 14:06:35.000000000 +0100
++++ pyside-0.2.2/PySide/QtScriptTools/CMakeLists.txt	2009-12-18 14:08:19.000000000 +0100
+@@ -52,7 +52,7 @@
+                       pysidebase)
+ 
+ # install
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtScriptTools.so
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtScriptTools${CMAKE_DEBUG_POSTFIX}.so
+         DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
+ 
+ 
+Index: pyside-0.2.2/PySide/QtSql/CMakeLists.txt
+===================================================================
+--- pyside-0.2.2.orig/PySide/QtSql/CMakeLists.txt	2009-12-18 14:06:35.000000000 +0100
++++ pyside-0.2.2/PySide/QtSql/CMakeLists.txt	2009-12-18 14:08:28.000000000 +0100
+@@ -47,6 +47,6 @@
+                       pysidebase)
+ 
+ # install
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtSql.so
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtSql${CMAKE_DEBUG_POSTFIX}.so
+         DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
+ 
+Index: pyside-0.2.2/PySide/QtSvg/CMakeLists.txt
+===================================================================
+--- pyside-0.2.2.orig/PySide/QtSvg/CMakeLists.txt	2009-12-18 14:06:35.000000000 +0100
++++ pyside-0.2.2/PySide/QtSvg/CMakeLists.txt	2009-12-18 14:08:34.000000000 +0100
+@@ -37,5 +37,5 @@
+                       pysidebase)
+ 
+ # install
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtSvg.so
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtSvg${CMAKE_DEBUG_POSTFIX}.so
+         DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
+Index: pyside-0.2.2/PySide/QtUiTools/CMakeLists.txt
+===================================================================
+--- pyside-0.2.2.orig/PySide/QtUiTools/CMakeLists.txt	2009-12-18 14:06:35.000000000 +0100
++++ pyside-0.2.2/PySide/QtUiTools/CMakeLists.txt	2009-12-18 14:08:41.000000000 +0100
+@@ -30,6 +30,6 @@
+                       pysidebase)
+ 
+ # install
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtUiTools.so
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtUiTools${CMAKE_DEBUG_POSTFIX}.so
+         DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
+ 
+Index: pyside-0.2.2/PySide/QtWebKit/CMakeLists.txt
+===================================================================
+--- pyside-0.2.2.orig/PySide/QtWebKit/CMakeLists.txt	2009-12-18 14:06:35.000000000 +0100
++++ pyside-0.2.2/PySide/QtWebKit/CMakeLists.txt	2009-12-18 14:08:47.000000000 +0100
+@@ -61,5 +61,5 @@
+                       pysidebase)
+ 
+ # install
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtWebKit.so
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtWebKit${CMAKE_DEBUG_POSTFIX}.so
+         DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
+Index: pyside-0.2.2/PySide/QtXml/CMakeLists.txt
+===================================================================
+--- pyside-0.2.2.orig/PySide/QtXml/CMakeLists.txt	2009-12-18 14:06:35.000000000 +0100
++++ pyside-0.2.2/PySide/QtXml/CMakeLists.txt	2009-12-18 14:08:54.000000000 +0100
+@@ -59,6 +59,6 @@
+                       pysidebase)
+ 
+ # install
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtXml.so
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtXml${CMAKE_DEBUG_POSTFIX}.so
+         DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
+ 
+Index: pyside-0.2.2/PySide/QtXmlPatterns/CMakeLists.txt
+===================================================================
+--- pyside-0.2.2.orig/PySide/QtXmlPatterns/CMakeLists.txt	2009-12-18 14:06:36.000000000 +0100
++++ pyside-0.2.2/PySide/QtXmlPatterns/CMakeLists.txt	2009-12-18 14:09:02.000000000 +0100
+@@ -51,6 +51,6 @@
+                       pysidebase)
+ 
+ # install
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtXmlPatterns.so
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtXmlPatterns${CMAKE_DEBUG_POSTFIX}.so
+         DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
+ 
+Index: pyside-0.2.2/PySide/phonon/CMakeLists.txt
+===================================================================
+--- pyside-0.2.2.orig/PySide/phonon/CMakeLists.txt	2009-12-18 14:06:35.000000000 +0100
++++ pyside-0.2.2/PySide/phonon/CMakeLists.txt	2009-12-18 14:07:08.000000000 +0100
+@@ -78,5 +78,5 @@
+                       pysidebase)
+ 
+ # install
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/phonon.so
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/phonon${CMAKE_DEBUG_POSTFIX}.so
+         DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})

Modified: packages/pyside/trunk/debian/patches/series
===================================================================
--- packages/pyside/trunk/debian/patches/series	2009-12-18 13:32:11 UTC (rev 10821)
+++ packages/pyside/trunk/debian/patches/series	2009-12-18 13:41:17 UTC (rev 10822)
@@ -1 +1,3 @@
 multiple_python_versions.patch
+use_cmake_no_config.patch
+debug_build_add_postfix.patch

Added: packages/pyside/trunk/debian/patches/use_cmake_no_config.patch
===================================================================
--- packages/pyside/trunk/debian/patches/use_cmake_no_config.patch	                        (rev 0)
+++ packages/pyside/trunk/debian/patches/use_cmake_no_config.patch	2009-12-18 13:41:17 UTC (rev 10822)
@@ -0,0 +1,110 @@
+Description: Use cmake Config feature instead of Find*.
+Author: Didier Raboud <didier at raboud.com>, with major help from Modestas Vainius <modax at debian.org>
+Origin: vendor
+Forwarded: no
+Last-Update: 2009-12-18
+Index: pyside-0.2.2/base/CMakeLists.txt
+===================================================================
+--- pyside-0.2.2.orig/base/CMakeLists.txt	2009-12-18 14:36:00.000000000 +0100
++++ pyside-0.2.2/base/CMakeLists.txt	2009-12-18 14:36:06.000000000 +0100
+@@ -58,7 +58,8 @@
+ 
+ install(FILES ${pysidbase_HEADERS}
+         DESTINATION include/${BINDING_NAME})
+-install(TARGETS pysidebase LIBRARY DESTINATION ${LIB_INSTALL_DIR})
++install(TARGETS pysidebase EXPORT pysidebase
++                           LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+ 
+ 
+ 
+Index: pyside-0.2.2/data/CMakeLists.txt
+===================================================================
+--- pyside-0.2.2.orig/data/CMakeLists.txt	2009-12-18 14:36:00.000000000 +0100
++++ pyside-0.2.2/data/CMakeLists.txt	2009-12-18 14:36:06.000000000 +0100
+@@ -1,11 +1,10 @@
+ project(data)
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/FindPySide.cmake.in
+-               ${CMAKE_CURRENT_BINARY_DIR}/FindPySide.cmake @ONLY)
+-
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FindPySide.cmake
+-        DESTINATION share/cmake-2.6/Modules)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/PySideConfig.cmake.in
++               ${CMAKE_CURRENT_BINARY_DIR}/PySideConfig.cmake @ONLY)
+ 
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySideConfig.cmake
++        DESTINATION ${LIB_INSTALL_DIR}/cmake/PySide)
+ 
+ # create pkg-config file
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pyside.pc.in
+Index: pyside-0.2.2/data/FindPySide.cmake.in
+===================================================================
+--- pyside-0.2.2.orig/data/FindPySide.cmake.in	2009-12-18 14:36:00.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,39 +0,0 @@
+-# - try to find PYSIDE
+-#  PYSIDE_INCLUDE_DIR    - Directories to include to use PYSIDE
+-#  PYSIDE_LIBRARIES      - Files to link against to use PYSIDE
+-#  PYSIDE_TYPESYSTEM_DIR - Directories containing typesystem used to extend PYSIDE
+-#  PYSIDE_FOUND          - PYSIDE was found
+-#
+-#  PYSIDE_API_VERSION    - Version of binding api
+-#  PYSIDE_QT_VERISON     - Version of Wrapped Qt
+-
+-
+-FIND_PATH(PYSIDE_INCLUDE_DIR pyside.hpp @CMAKE_INSTALL_PREFIX@/include/@BINDING_NAME@)
+-FIND_LIBRARY(PYSIDE_LIBRARY pysidebase @CMAKE_INSTALL_PREFIX@/lib)
+-FIND_PATH(PYSIDE_TYPESYSTEM_DIR typesystem_core.xml @CMAKE_INSTALL_PREFIX@/share/@BINDING_NAME@/typesystem)
+-
+-SET(PYSIDE_FOUND "NO")
+-IF(PYSIDE_LIBRARY AND PYSIDE_INCLUDE_DIR)
+-    find_package(Boost 1.38.0 COMPONENTS python REQUIRED)
+-    find_package(PythonLibs REQUIRED)
+-    find_package(Qt4 4.5.0 REQUIRED)
+-
+-    #Version
+-    SET(PYSIDE_API_VERSION @BINDING_API_VERSION@)
+-    SET(PYSIDE_QT_VERSION @QT_VERSION_MAJOR at .@QT_VERSION_MINOR@)
+-
+-    SET(PYSIDE_FOUND "YES")
+-    SET(PYSIDE_INCLUDE_DIR 
+-        ${Boost_INCLUDE_DIR}
+-        ${PYTHON_INCLUDE_PATH}
+-        ${QT_INCLUDE_DIR}
+-        ${QT_QTCORE_INCLUDE_DIR}
+-        ${PYSIDE_INCLUDE_DIR})
+-    SET(PYSIDE_LIBRARY
+-        ${Boost_PYTHON_LIBRARY}
+-        ${PYTHON_LIBRARIES}
+-        ${QT_QTCORE_LIBRARY}
+-        ${PYSIDE_LIBRARY})
+-ENDIF(PYSIDE_LIBRARY AND PYSIDE_INCLUDE_DIR)
+-
+-
+Index: pyside-0.2.2/data/PySideConfig.cmake.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ pyside-0.2.2/data/PySideConfig.cmake.in	2009-12-18 14:36:31.000000000 +0100
+@@ -0,0 +1,22 @@
++# - try to find PySide
++#  PYSIDE_INCLUDE_DIR    - Directories to include to use PYSIDE
++#  PYSIDE_LIBRARY        - Files to link against to use PYSIDE
++#  PYSIDE_TYPESYSTEM_DIR - Directories containing typesystem used to extend PYSIDE
++#  PYSIDE_FOUND          - PYSIDE was found
++#
++#  PYSIDE_API_VERSION    - Version of binding api
++#  PYSIDE_QT_VERISON     - Version of Wrapped Qt
++
++SET(PYSIDE_INCLUDE_DIR
++     ${Boost_INCLUDE_DIR}
++     ${PYTHON_INCLUDE_PATH}
++     ${QT_INCLUDE_DIR}
++     ${QT_QTCORE_INCLUDE_DIR}
++     "/usr/include/PySide")
++SET(PYSIDE_LIBRARY
++     ${Boost_PYTHON_LIBRARY}
++     ${PYTHON_LIBRARIES}
++     ${QT_QTCORE_LIBRARY}
++     "pysidebase")
++SET(PYSIDE_TYPESYSTEM_DIR "/usr/share/PySide/typesystem/")
++SET(PYSIDE_FOUND "YES")

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-12-18 13:41:17 UTC (rev 10822)
@@ -0,0 +1 @@
+usr/lib/python*/*-packages/PySide/*_d.so

Modified: packages/pyside/trunk/debian/rules
===================================================================
--- packages/pyside/trunk/debian/rules	2009-12-18 13:32:11 UTC (rev 10821)
+++ packages/pyside/trunk/debian/rules	2009-12-18 13:41:17 UTC (rev 10822)
@@ -6,15 +6,24 @@
 PYVERSIONS=$(shell pyversions -v -r)
 ALLPY=$(PYVERSIONS:%=%-dbg) $(PYVERSIONS)
 
-override_dh_auto_configure: $(ALLPY:%=override_dh_auto_configure-%)
+# Separate configuration for debug compilations and normal ones
+override_dh_auto_configure: $(PYVERSIONS:%=override_dh_auto_configure-%) $(PYVERSIONS:%=override_dh_auto_configure_dbg-%-dbg)
 
+# Normal configuration
 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
+	dh_auto_configure --builddirectory=build-$* -- -DBUILD_PYTHON=/usr/bin/python$* -DCMAKE_SKIP_RPATH=true -DCMAKE_BUILDTYPE:STRING="Release"
 
+# Debug configuration
+override_dh_auto_configure_dbg-%:
+	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 -DCMAKE_DEBUG_POSTFIX:STRING="_d" -DCMAKE_BUILD_TYPE:STRING="Debug"
 
+
 override_dh_auto_build: $(ALLPY:%=override_dh_auto_build-%)
 
 override_dh_auto_build-%:

More information about the Python-modules-commits mailing list