[Python-modules-commits] r11247 - in packages/pyside/trunk/debian/patches (1 file)
odyx-guest at users.alioth.debian.org
odyx-guest at users.alioth.debian.org
Fri Jan 22 17:10:42 UTC 2010
Date: Friday, January 22, 2010 @ 17:10:37
Author: odyx-guest
Revision: 11247
Refresh patch + complete description
Modified:
packages/pyside/trunk/debian/patches/debug_build_add_postfix.patch
Modified: packages/pyside/trunk/debian/patches/debug_build_add_postfix.patch
===================================================================
--- packages/pyside/trunk/debian/patches/debug_build_add_postfix.patch 2010-01-22 15:57:16 UTC (rev 11246)
+++ packages/pyside/trunk/debian/patches/debug_build_add_postfix.patch 2010-01-22 17:10:37 UTC (rev 11247)
@@ -1,12 +1,12 @@
Description: Correctly installs the *_d.so files by adding the configured prefix.
- Disable it in the library.
+ Disable it in the library to not confuse the _d.so linking.
Author: Didier Raboud <didier at raboud.com>
Last-Update: 2010-01-22
Origin: vendor
-Index: pyside-0.2.3/PySide/QtCore/CMakeLists.txt
+Index: pyside-qt4.6+0.2.3/PySide/QtCore/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtCore/CMakeLists.txt 2010-01-22 09:49:35.000000000 +0100
-+++ pyside-0.2.3/PySide/QtCore/CMakeLists.txt 2010-01-22 09:51:07.000000000 +0100
+--- pyside-qt4.6+0.2.3.orig/PySide/QtCore/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-qt4.6+0.2.3/PySide/QtCore/CMakeLists.txt 2010-01-22 18:08:40.000000000 +0100
@@ -152,6 +152,6 @@
pysidebase)
@@ -15,10 +15,10 @@
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtCore${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
-Index: pyside-0.2.3/PySide/QtGui/CMakeLists.txt
+Index: pyside-qt4.6+0.2.3/PySide/QtGui/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtGui/CMakeLists.txt 2010-01-22 09:49:35.000000000 +0100
-+++ pyside-0.2.3/PySide/QtGui/CMakeLists.txt 2010-01-22 09:51:07.000000000 +0100
+--- pyside-qt4.6+0.2.3.orig/PySide/QtGui/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-qt4.6+0.2.3/PySide/QtGui/CMakeLists.txt 2010-01-22 18:08:40.000000000 +0100
@@ -808,6 +808,6 @@
endif(CMAKE_HOST_UNIX)
@@ -27,10 +27,10 @@
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtGui${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
-Index: pyside-0.2.3/PySide/QtHelp/CMakeLists.txt
+Index: pyside-qt4.6+0.2.3/PySide/QtHelp/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtHelp/CMakeLists.txt 2010-01-22 09:49:35.000000000 +0100
-+++ pyside-0.2.3/PySide/QtHelp/CMakeLists.txt 2010-01-22 09:51:07.000000000 +0100
+--- pyside-qt4.6+0.2.3.orig/PySide/QtHelp/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-qt4.6+0.2.3/PySide/QtHelp/CMakeLists.txt 2010-01-22 18:08:40.000000000 +0100
@@ -43,7 +43,7 @@
pysidebase)
@@ -40,10 +40,10 @@
DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
-Index: pyside-0.2.3/PySide/QtMultimedia/CMakeLists.txt
+Index: pyside-qt4.6+0.2.3/PySide/QtMultimedia/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtMultimedia/CMakeLists.txt 2010-01-22 09:49:35.000000000 +0100
-+++ pyside-0.2.3/PySide/QtMultimedia/CMakeLists.txt 2010-01-22 09:51:07.000000000 +0100
+--- pyside-qt4.6+0.2.3.orig/PySide/QtMultimedia/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-qt4.6+0.2.3/PySide/QtMultimedia/CMakeLists.txt 2010-01-22 18:08:40.000000000 +0100
@@ -51,5 +51,5 @@
pysidebase)
@@ -51,10 +51,10 @@
-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.3/PySide/QtNetwork/CMakeLists.txt
+Index: pyside-qt4.6+0.2.3/PySide/QtNetwork/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtNetwork/CMakeLists.txt 2010-01-22 09:49:35.000000000 +0100
-+++ pyside-0.2.3/PySide/QtNetwork/CMakeLists.txt 2010-01-22 09:51:07.000000000 +0100
+--- pyside-qt4.6+0.2.3.orig/PySide/QtNetwork/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-qt4.6+0.2.3/PySide/QtNetwork/CMakeLists.txt 2010-01-22 18:08:40.000000000 +0100
@@ -91,6 +91,6 @@
pysidebase)
@@ -63,10 +63,10 @@
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtNetwork${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
-Index: pyside-0.2.3/PySide/QtOpenGL/CMakeLists.txt
+Index: pyside-qt4.6+0.2.3/PySide/QtOpenGL/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtOpenGL/CMakeLists.txt 2010-01-22 09:49:35.000000000 +0100
-+++ pyside-0.2.3/PySide/QtOpenGL/CMakeLists.txt 2010-01-22 09:51:07.000000000 +0100
+--- pyside-qt4.6+0.2.3.orig/PySide/QtOpenGL/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-qt4.6+0.2.3/PySide/QtOpenGL/CMakeLists.txt 2010-01-22 18:08:40.000000000 +0100
@@ -48,6 +48,6 @@
pysidebase)
@@ -75,10 +75,10 @@
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtOpenGL${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
-Index: pyside-0.2.3/PySide/QtScript/CMakeLists.txt
+Index: pyside-qt4.6+0.2.3/PySide/QtScript/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtScript/CMakeLists.txt 2010-01-22 09:49:35.000000000 +0100
-+++ pyside-0.2.3/PySide/QtScript/CMakeLists.txt 2010-01-22 09:51:07.000000000 +0100
+--- pyside-qt4.6+0.2.3.orig/PySide/QtScript/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-qt4.6+0.2.3/PySide/QtScript/CMakeLists.txt 2010-01-22 18:08:40.000000000 +0100
@@ -39,7 +39,7 @@
pysidebase)
@@ -88,10 +88,10 @@
DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
-Index: pyside-0.2.3/PySide/QtScriptTools/CMakeLists.txt
+Index: pyside-qt4.6+0.2.3/PySide/QtScriptTools/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtScriptTools/CMakeLists.txt 2010-01-22 09:49:35.000000000 +0100
-+++ pyside-0.2.3/PySide/QtScriptTools/CMakeLists.txt 2010-01-22 09:51:07.000000000 +0100
+--- pyside-qt4.6+0.2.3.orig/PySide/QtScriptTools/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-qt4.6+0.2.3/PySide/QtScriptTools/CMakeLists.txt 2010-01-22 18:08:40.000000000 +0100
@@ -52,7 +52,7 @@
pysidebase)
@@ -101,10 +101,10 @@
DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
-Index: pyside-0.2.3/PySide/QtSql/CMakeLists.txt
+Index: pyside-qt4.6+0.2.3/PySide/QtSql/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtSql/CMakeLists.txt 2010-01-22 09:49:35.000000000 +0100
-+++ pyside-0.2.3/PySide/QtSql/CMakeLists.txt 2010-01-22 09:51:07.000000000 +0100
+--- pyside-qt4.6+0.2.3.orig/PySide/QtSql/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-qt4.6+0.2.3/PySide/QtSql/CMakeLists.txt 2010-01-22 18:08:40.000000000 +0100
@@ -47,6 +47,6 @@
pysidebase)
@@ -113,10 +113,10 @@
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtSql${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
-Index: pyside-0.2.3/PySide/QtSvg/CMakeLists.txt
+Index: pyside-qt4.6+0.2.3/PySide/QtSvg/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtSvg/CMakeLists.txt 2010-01-22 09:49:35.000000000 +0100
-+++ pyside-0.2.3/PySide/QtSvg/CMakeLists.txt 2010-01-22 09:51:07.000000000 +0100
+--- pyside-qt4.6+0.2.3.orig/PySide/QtSvg/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-qt4.6+0.2.3/PySide/QtSvg/CMakeLists.txt 2010-01-22 18:08:40.000000000 +0100
@@ -37,5 +37,5 @@
pysidebase)
@@ -124,10 +124,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.3/PySide/QtUiTools/CMakeLists.txt
+Index: pyside-qt4.6+0.2.3/PySide/QtUiTools/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtUiTools/CMakeLists.txt 2010-01-22 09:49:35.000000000 +0100
-+++ pyside-0.2.3/PySide/QtUiTools/CMakeLists.txt 2010-01-22 09:51:07.000000000 +0100
+--- pyside-qt4.6+0.2.3.orig/PySide/QtUiTools/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-qt4.6+0.2.3/PySide/QtUiTools/CMakeLists.txt 2010-01-22 18:08:40.000000000 +0100
@@ -30,6 +30,6 @@
pysidebase)
@@ -136,10 +136,10 @@
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtUiTools${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
-Index: pyside-0.2.3/PySide/QtWebKit/CMakeLists.txt
+Index: pyside-qt4.6+0.2.3/PySide/QtWebKit/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtWebKit/CMakeLists.txt 2010-01-22 09:49:35.000000000 +0100
-+++ pyside-0.2.3/PySide/QtWebKit/CMakeLists.txt 2010-01-22 09:51:07.000000000 +0100
+--- pyside-qt4.6+0.2.3.orig/PySide/QtWebKit/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-qt4.6+0.2.3/PySide/QtWebKit/CMakeLists.txt 2010-01-22 18:08:40.000000000 +0100
@@ -61,5 +61,5 @@
pysidebase)
@@ -147,10 +147,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.3/PySide/QtXml/CMakeLists.txt
+Index: pyside-qt4.6+0.2.3/PySide/QtXml/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtXml/CMakeLists.txt 2010-01-22 09:49:35.000000000 +0100
-+++ pyside-0.2.3/PySide/QtXml/CMakeLists.txt 2010-01-22 09:51:07.000000000 +0100
+--- pyside-qt4.6+0.2.3.orig/PySide/QtXml/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-qt4.6+0.2.3/PySide/QtXml/CMakeLists.txt 2010-01-22 18:08:40.000000000 +0100
@@ -59,6 +59,6 @@
pysidebase)
@@ -159,10 +159,10 @@
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtXml${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
-Index: pyside-0.2.3/PySide/QtXmlPatterns/CMakeLists.txt
+Index: pyside-qt4.6+0.2.3/PySide/QtXmlPatterns/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtXmlPatterns/CMakeLists.txt 2010-01-22 09:49:35.000000000 +0100
-+++ pyside-0.2.3/PySide/QtXmlPatterns/CMakeLists.txt 2010-01-22 09:51:07.000000000 +0100
+--- pyside-qt4.6+0.2.3.orig/PySide/QtXmlPatterns/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-qt4.6+0.2.3/PySide/QtXmlPatterns/CMakeLists.txt 2010-01-22 18:08:40.000000000 +0100
@@ -51,6 +51,6 @@
pysidebase)
@@ -171,10 +171,10 @@
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtXmlPatterns${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
-Index: pyside-0.2.3/PySide/phonon/CMakeLists.txt
+Index: pyside-qt4.6+0.2.3/PySide/phonon/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/phonon/CMakeLists.txt 2010-01-22 09:49:35.000000000 +0100
-+++ pyside-0.2.3/PySide/phonon/CMakeLists.txt 2010-01-22 09:51:07.000000000 +0100
+--- pyside-qt4.6+0.2.3.orig/PySide/phonon/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-qt4.6+0.2.3/PySide/phonon/CMakeLists.txt 2010-01-22 18:08:40.000000000 +0100
@@ -78,5 +78,5 @@
pysidebase)
@@ -182,10 +182,10 @@
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/phonon.so
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/phonon${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
-Index: pyside-0.2.3/PySide/CMakeLists.txt
+Index: pyside-qt4.6+0.2.3/PySide/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/CMakeLists.txt 2010-01-22 09:49:35.000000000 +0100
-+++ pyside-0.2.3/PySide/CMakeLists.txt 2010-01-22 09:51:07.000000000 +0100
+--- pyside-qt4.6+0.2.3.orig/PySide/CMakeLists.txt 2009-12-17 23:05:13.000000000 +0100
++++ pyside-qt4.6+0.2.3/PySide/CMakeLists.txt 2010-01-22 18:08:40.000000000 +0100
@@ -48,8 +48,8 @@
IF (${var})
add_subdirectory(${name})
@@ -197,15 +197,15 @@
else (${var})
message(STATUS "${name} NOT found. ${name} support disabled.")
endif (${var})
-Index: pyside-0.2.3/base/CMakeLists.txt
+Index: pyside-qt4.6+0.2.3/base/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/base/CMakeLists.txt 2010-01-22 09:51:19.000000000 +0100
-+++ pyside-0.2.3/base/CMakeLists.txt 2010-01-22 10:02:57.000000000 +0100
+--- pyside-qt4.6+0.2.3.orig/base/CMakeLists.txt 2010-01-22 18:08:39.000000000 +0100
++++ pyside-qt4.6+0.2.3/base/CMakeLists.txt 2010-01-22 18:09:11.000000000 +0100
@@ -14,6 +14,9 @@
wrapper.cpp
)
-+# Don't use the DEBUG_POSTFIX here
++# Don't use the DEBUG_POSTFIX here: It confuses the linking of _d.so modules.
+set(CMAKE_DEBUG_POSTFIX "")
+
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
More information about the Python-modules-commits
mailing list