[Python-modules-commits] r11244 - in packages/pyside/trunk/debian (2 files)
odyx-guest at users.alioth.debian.org
odyx-guest at users.alioth.debian.org
Fri Jan 22 09:28:16 UTC 2010
Date: Friday, January 22, 2010 @ 09:28:14
Author: odyx-guest
Revision: 11244
Update debug_build*.patch and rules. This should "make it"
Modified:
packages/pyside/trunk/debian/patches/debug_build_add_postfix.patch
packages/pyside/trunk/debian/rules
Modified: packages/pyside/trunk/debian/patches/debug_build_add_postfix.patch
===================================================================
--- packages/pyside/trunk/debian/patches/debug_build_add_postfix.patch 2010-01-21 14:31:12 UTC (rev 11243)
+++ packages/pyside/trunk/debian/patches/debug_build_add_postfix.patch 2010-01-22 09:28:14 UTC (rev 11244)
@@ -1,11 +1,12 @@
-Description: Correctly installs the *_d.so files by adding the configured prefix
+Description: Correctly installs the *_d.so files by adding the configured prefix.
+ Disable it in the library.
Author: Didier Raboud <didier at raboud.com>
-Last-Update: 2010-01-21
+Last-Update: 2010-01-22
Origin: vendor
Index: pyside-0.2.3/PySide/QtCore/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtCore/CMakeLists.txt 2010-01-21 15:18:46.000000000 +0100
-+++ pyside-0.2.3/PySide/QtCore/CMakeLists.txt 2010-01-21 15:18:48.000000000 +0100
+--- 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
@@ -152,6 +152,6 @@
pysidebase)
@@ -16,8 +17,8 @@
Index: pyside-0.2.3/PySide/QtGui/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtGui/CMakeLists.txt 2010-01-21 15:18:46.000000000 +0100
-+++ pyside-0.2.3/PySide/QtGui/CMakeLists.txt 2010-01-21 15:18:48.000000000 +0100
+--- 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
@@ -808,6 +808,6 @@
endif(CMAKE_HOST_UNIX)
@@ -28,8 +29,8 @@
Index: pyside-0.2.3/PySide/QtHelp/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtHelp/CMakeLists.txt 2010-01-21 15:18:46.000000000 +0100
-+++ pyside-0.2.3/PySide/QtHelp/CMakeLists.txt 2010-01-21 15:18:48.000000000 +0100
+--- 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
@@ -43,7 +43,7 @@
pysidebase)
@@ -41,8 +42,8 @@
Index: pyside-0.2.3/PySide/QtMultimedia/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtMultimedia/CMakeLists.txt 2010-01-21 15:18:46.000000000 +0100
-+++ pyside-0.2.3/PySide/QtMultimedia/CMakeLists.txt 2010-01-21 15:18:48.000000000 +0100
+--- 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
@@ -51,5 +51,5 @@
pysidebase)
@@ -52,8 +53,8 @@
DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
Index: pyside-0.2.3/PySide/QtNetwork/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtNetwork/CMakeLists.txt 2010-01-21 15:18:46.000000000 +0100
-+++ pyside-0.2.3/PySide/QtNetwork/CMakeLists.txt 2010-01-21 15:18:48.000000000 +0100
+--- 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
@@ -91,6 +91,6 @@
pysidebase)
@@ -64,8 +65,8 @@
Index: pyside-0.2.3/PySide/QtOpenGL/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtOpenGL/CMakeLists.txt 2010-01-21 15:18:46.000000000 +0100
-+++ pyside-0.2.3/PySide/QtOpenGL/CMakeLists.txt 2010-01-21 15:18:48.000000000 +0100
+--- 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
@@ -48,6 +48,6 @@
pysidebase)
@@ -76,8 +77,8 @@
Index: pyside-0.2.3/PySide/QtScript/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtScript/CMakeLists.txt 2010-01-21 15:18:46.000000000 +0100
-+++ pyside-0.2.3/PySide/QtScript/CMakeLists.txt 2010-01-21 15:18:48.000000000 +0100
+--- 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
@@ -39,7 +39,7 @@
pysidebase)
@@ -89,8 +90,8 @@
Index: pyside-0.2.3/PySide/QtScriptTools/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtScriptTools/CMakeLists.txt 2010-01-21 15:18:46.000000000 +0100
-+++ pyside-0.2.3/PySide/QtScriptTools/CMakeLists.txt 2010-01-21 15:18:48.000000000 +0100
+--- 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
@@ -52,7 +52,7 @@
pysidebase)
@@ -102,8 +103,8 @@
Index: pyside-0.2.3/PySide/QtSql/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtSql/CMakeLists.txt 2010-01-21 15:18:46.000000000 +0100
-+++ pyside-0.2.3/PySide/QtSql/CMakeLists.txt 2010-01-21 15:18:48.000000000 +0100
+--- 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
@@ -47,6 +47,6 @@
pysidebase)
@@ -114,8 +115,8 @@
Index: pyside-0.2.3/PySide/QtSvg/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtSvg/CMakeLists.txt 2010-01-21 15:18:46.000000000 +0100
-+++ pyside-0.2.3/PySide/QtSvg/CMakeLists.txt 2010-01-21 15:18:48.000000000 +0100
+--- 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
@@ -37,5 +37,5 @@
pysidebase)
@@ -125,8 +126,8 @@
DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
Index: pyside-0.2.3/PySide/QtUiTools/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtUiTools/CMakeLists.txt 2010-01-21 15:18:46.000000000 +0100
-+++ pyside-0.2.3/PySide/QtUiTools/CMakeLists.txt 2010-01-21 15:18:48.000000000 +0100
+--- 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
@@ -30,6 +30,6 @@
pysidebase)
@@ -137,8 +138,8 @@
Index: pyside-0.2.3/PySide/QtWebKit/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtWebKit/CMakeLists.txt 2010-01-21 15:18:46.000000000 +0100
-+++ pyside-0.2.3/PySide/QtWebKit/CMakeLists.txt 2010-01-21 15:18:48.000000000 +0100
+--- 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
@@ -61,5 +61,5 @@
pysidebase)
@@ -148,8 +149,8 @@
DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
Index: pyside-0.2.3/PySide/QtXml/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtXml/CMakeLists.txt 2010-01-21 15:18:46.000000000 +0100
-+++ pyside-0.2.3/PySide/QtXml/CMakeLists.txt 2010-01-21 15:18:48.000000000 +0100
+--- 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
@@ -59,6 +59,6 @@
pysidebase)
@@ -160,8 +161,8 @@
Index: pyside-0.2.3/PySide/QtXmlPatterns/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/QtXmlPatterns/CMakeLists.txt 2010-01-21 15:18:46.000000000 +0100
-+++ pyside-0.2.3/PySide/QtXmlPatterns/CMakeLists.txt 2010-01-21 15:18:48.000000000 +0100
+--- 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
@@ -51,6 +51,6 @@
pysidebase)
@@ -172,8 +173,8 @@
Index: pyside-0.2.3/PySide/phonon/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/phonon/CMakeLists.txt 2010-01-21 15:18:45.000000000 +0100
-+++ pyside-0.2.3/PySide/phonon/CMakeLists.txt 2010-01-21 15:18:48.000000000 +0100
+--- 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
@@ -78,5 +78,5 @@
pysidebase)
@@ -183,8 +184,8 @@
DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
Index: pyside-0.2.3/PySide/CMakeLists.txt
===================================================================
---- pyside-0.2.3.orig/PySide/CMakeLists.txt 2010-01-21 15:18:56.000000000 +0100
-+++ pyside-0.2.3/PySide/CMakeLists.txt 2010-01-21 15:19:40.000000000 +0100
+--- 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
@@ -48,8 +48,8 @@
IF (${var})
add_subdirectory(${name})
@@ -196,3 +197,17 @@
else (${var})
message(STATUS "${name} NOT found. ${name} support disabled.")
endif (${var})
+Index: pyside-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
+@@ -14,6 +14,9 @@
+ wrapper.cpp
+ )
+
++# Don't use the DEBUG_POSTFIX here
++set(CMAKE_DEBUG_POSTFIX "")
++
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+ ${QT_INCLUDE_DIR}
+ ${PYTHON_INCLUDE_PATH}
Modified: packages/pyside/trunk/debian/rules
===================================================================
--- packages/pyside/trunk/debian/rules 2010-01-21 14:31:12 UTC (rev 11243)
+++ packages/pyside/trunk/debian/rules 2010-01-22 09:28:14 UTC (rev 11244)
@@ -35,9 +35,9 @@
override_dh_auto_install-%:
dh_auto_install --builddirectory=build-$*
-# Move debug libraries to our -dbg lib
+# Move debug libraries to our -dbg lib, don't strip the debug build
override_dh_strip:
- dh_strip --dbg-package=python-pyside-dbg
+ dh_strip --dbg-package=python-pyside-dbg --exclude=_d.so
override_dh_auto_clean:
rm -rf build-*
More information about the Python-modules-commits
mailing list