[Python-modules-commits] r11242 - in packages/pyside/trunk/debian/patches (2 files)
odyx-guest at users.alioth.debian.org
odyx-guest at users.alioth.debian.org
Thu Jan 21 12:57:30 UTC 2010
Date: Thursday, January 21, 2010 @ 12:57:24
Author: odyx-guest
Revision: 11242
Refresh patches
Modified:
packages/pyside/trunk/debian/patches/debug_build_add_postfix.patch
packages/pyside/trunk/debian/patches/multiple_python_versions.patch
Modified: packages/pyside/trunk/debian/patches/debug_build_add_postfix.patch
===================================================================
--- packages/pyside/trunk/debian/patches/debug_build_add_postfix.patch 2010-01-21 12:45:27 UTC (rev 11241)
+++ packages/pyside/trunk/debian/patches/debug_build_add_postfix.patch 2010-01-21 12:57:24 UTC (rev 11242)
@@ -1,12 +1,12 @@
Description: Correctly installs the *_d.so files by adding the configured prefix
Author: Didier Raboud <didier at raboud.com>
-Last-Update: 2009-12-18
+Last-Update: 2010-01-21
Origin: vendor
-Index: pyside-0.2.2/PySide/QtCore/CMakeLists.txt
+Index: pyside-0.2.3/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 @@
+--- pyside-0.2.3.orig/PySide/QtCore/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-0.2.3/PySide/QtCore/CMakeLists.txt 2010-01-21 13:55:37.000000000 +0100
+@@ -152,6 +152,6 @@
pysidebase)
# install
@@ -14,10 +14,10 @@
+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
+Index: pyside-0.2.3/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
+--- pyside-0.2.3.orig/PySide/QtGui/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-0.2.3/PySide/QtGui/CMakeLists.txt 2010-01-21 13:55:38.000000000 +0100
@@ -808,6 +808,6 @@
endif(CMAKE_HOST_UNIX)
@@ -26,10 +26,10 @@
+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
+Index: pyside-0.2.3/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
+--- pyside-0.2.3.orig/PySide/QtHelp/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-0.2.3/PySide/QtHelp/CMakeLists.txt 2010-01-21 13:55:38.000000000 +0100
@@ -43,7 +43,7 @@
pysidebase)
@@ -39,21 +39,21 @@
DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
-Index: pyside-0.2.2/PySide/QtMultimedia/CMakeLists.txt
+Index: pyside-0.2.3/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 @@
+--- pyside-0.2.3.orig/PySide/QtMultimedia/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-0.2.3/PySide/QtMultimedia/CMakeLists.txt 2010-01-21 13:55:38.000000000 +0100
+@@ -51,5 +51,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
+Index: pyside-0.2.3/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
+--- pyside-0.2.3.orig/PySide/QtNetwork/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-0.2.3/PySide/QtNetwork/CMakeLists.txt 2010-01-21 13:55:38.000000000 +0100
@@ -91,6 +91,6 @@
pysidebase)
@@ -62,10 +62,10 @@
+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
+Index: pyside-0.2.3/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
+--- pyside-0.2.3.orig/PySide/QtOpenGL/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-0.2.3/PySide/QtOpenGL/CMakeLists.txt 2010-01-21 13:55:38.000000000 +0100
@@ -48,6 +48,6 @@
pysidebase)
@@ -74,10 +74,10 @@
+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
+Index: pyside-0.2.3/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
+--- pyside-0.2.3.orig/PySide/QtScript/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-0.2.3/PySide/QtScript/CMakeLists.txt 2010-01-21 13:55:38.000000000 +0100
@@ -39,7 +39,7 @@
pysidebase)
@@ -87,10 +87,10 @@
DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
-Index: pyside-0.2.2/PySide/QtScriptTools/CMakeLists.txt
+Index: pyside-0.2.3/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
+--- pyside-0.2.3.orig/PySide/QtScriptTools/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-0.2.3/PySide/QtScriptTools/CMakeLists.txt 2010-01-21 13:55:38.000000000 +0100
@@ -52,7 +52,7 @@
pysidebase)
@@ -100,10 +100,10 @@
DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
-Index: pyside-0.2.2/PySide/QtSql/CMakeLists.txt
+Index: pyside-0.2.3/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
+--- pyside-0.2.3.orig/PySide/QtSql/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-0.2.3/PySide/QtSql/CMakeLists.txt 2010-01-21 13:55:38.000000000 +0100
@@ -47,6 +47,6 @@
pysidebase)
@@ -112,10 +112,10 @@
+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
+Index: pyside-0.2.3/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
+--- pyside-0.2.3.orig/PySide/QtSvg/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-0.2.3/PySide/QtSvg/CMakeLists.txt 2010-01-21 13:55:38.000000000 +0100
@@ -37,5 +37,5 @@
pysidebase)
@@ -123,10 +123,10 @@
-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
+Index: pyside-0.2.3/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
+--- pyside-0.2.3.orig/PySide/QtUiTools/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-0.2.3/PySide/QtUiTools/CMakeLists.txt 2010-01-21 13:55:38.000000000 +0100
@@ -30,6 +30,6 @@
pysidebase)
@@ -135,10 +135,10 @@
+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
+Index: pyside-0.2.3/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
+--- pyside-0.2.3.orig/PySide/QtWebKit/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-0.2.3/PySide/QtWebKit/CMakeLists.txt 2010-01-21 13:55:38.000000000 +0100
@@ -61,5 +61,5 @@
pysidebase)
@@ -146,10 +146,10 @@
-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
+Index: pyside-0.2.3/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
+--- pyside-0.2.3.orig/PySide/QtXml/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-0.2.3/PySide/QtXml/CMakeLists.txt 2010-01-21 13:55:38.000000000 +0100
@@ -59,6 +59,6 @@
pysidebase)
@@ -158,10 +158,10 @@
+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
+Index: pyside-0.2.3/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
+--- pyside-0.2.3.orig/PySide/QtXmlPatterns/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-0.2.3/PySide/QtXmlPatterns/CMakeLists.txt 2010-01-21 13:55:38.000000000 +0100
@@ -51,6 +51,6 @@
pysidebase)
@@ -170,10 +170,10 @@
+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
+Index: pyside-0.2.3/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
+--- pyside-0.2.3.orig/PySide/phonon/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-0.2.3/PySide/phonon/CMakeLists.txt 2010-01-21 13:55:38.000000000 +0100
@@ -78,5 +78,5 @@
pysidebase)
Modified: packages/pyside/trunk/debian/patches/multiple_python_versions.patch
===================================================================
--- packages/pyside/trunk/debian/patches/multiple_python_versions.patch 2010-01-21 12:45:27 UTC (rev 11241)
+++ packages/pyside/trunk/debian/patches/multiple_python_versions.patch 2010-01-21 12:57:24 UTC (rev 11242)
@@ -1,16 +1,16 @@
Description: Allow multiple python versions (taken from the Gammu CMakeLists.txt)
Author: Didier Raboud <didier at raboud.com>
-Last-Update: 2009-12-17
+Last-Update: 2010-01-21
Origin: vendor
-Index: pyside-0.2.2/CMakeLists.txt
+Index: pyside-0.2.3/CMakeLists.txt
===================================================================
---- pyside-0.2.2.orig/CMakeLists.txt 2009-11-24 18:39:30.000000000 +0100
-+++ pyside-0.2.2/CMakeLists.txt 2009-12-11 13:43:07.000000000 +0100
+--- pyside-0.2.3.orig/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-0.2.3/CMakeLists.txt 2010-01-21 13:53:42.000000000 +0100
@@ -19,8 +19,39 @@
endif(CMAKE_HOST_UNIX)
- find_package(Boost 1.40.0 COMPONENTS python REQUIRED)
+ find_package(Boost 1.38.0 COMPONENTS python REQUIRED)
+# Select the Python Executable (Taken from the Gammu CMakeLists.txt)
+if (BUILD_PYTHON)
+ find_program(PYTHON_EXECUTABLE ${BUILD_PYTHON})
More information about the Python-modules-commits
mailing list