[Python-modules-commits] r12418 - in packages/pyside/trunk/debian (9 files)
odyx-guest at users.alioth.debian.org
odyx-guest at users.alioth.debian.org
Sat Mar 27 10:47:35 UTC 2010
Date: Saturday, March 27, 2010 @ 10:47:33
Author: odyx-guest
Revision: 12418
Add fixTests patch and use xvfb
Added:
packages/pyside/trunk/debian/patches/fixDebugPostfix.patch
(from rev 12417, packages/pyside/trunk/debian/patches/fixDebugPostix.patch)
packages/pyside/trunk/debian/patches/fixTests.patch
packages/pyside/trunk/debian/patches/libPythonVersionPostfix.patch
(from rev 12417, packages/pyside/trunk/debian/patches/lib_pythonversionpostfix.patch)
Modified:
packages/pyside/trunk/debian/changelog
packages/pyside/trunk/debian/control
packages/pyside/trunk/debian/patches/series
packages/pyside/trunk/debian/rules
Deleted:
packages/pyside/trunk/debian/patches/fixDebugPostix.patch
packages/pyside/trunk/debian/patches/lib_pythonversionpostfix.patch
Modified: packages/pyside/trunk/debian/changelog
===================================================================
--- packages/pyside/trunk/debian/changelog 2010-03-26 23:29:44 UTC (rev 12417)
+++ packages/pyside/trunk/debian/changelog 2010-03-27 10:47:33 UTC (rev 12418)
@@ -23,8 +23,9 @@
- use_cmake_no_config.patch: Drop
- spelling_error_in_binary.patch: Drop, incorporated upstream
+ fixDebugPostix.patch: include debug postfix'ed files
- + lib_pythonversionpostfix.patch: append -py* to the libraries
+ + libPythonVersionPostfix.patch: append -py* to the libraries
+ fixConvenienceSymlinks.patch: correctly symlink postfix'ed files
+ + fixTests.patch: Correct LD_PRELOAD_PATH and blacklist some tests
## DBG: * Re-enable -dbg build.
Modified: packages/pyside/trunk/debian/control
===================================================================
--- packages/pyside/trunk/debian/control 2010-03-26 23:29:44 UTC (rev 12417)
+++ packages/pyside/trunk/debian/control 2010-03-27 10:47:33 UTC (rev 12418)
@@ -5,8 +5,12 @@
Uploaders: Didier Raboud <didier at raboud.com>
Build-Depends: debhelper (>= 7.4.12~), cmake (>= 2.6.0), dpkg-dev (>= 1.15.6),
python-all-dev (>= 2.3.5-11), python-all-dbg (>= 2.3.5-11), python-support (>= 0.3.9),
- libqt4-dev (>= 4.6.2), libphonon-dev , libqt4-opengl-dev,
- shiboken (>= 0.2.0)
+ libqt4-dev, libphonon-dev, libqt4-opengl-dev,
+ shiboken (>= 0.2.0),
+ libqt4-sql-sqlite, xvfb, xauth
+# Various Build-Depends are needed for success of the testsuite:
+# libqt4-sql-sqlite is needed because we need one sql driver.
+# xvfb and xauth are needed to run a fake X Server
Standards-Version: 3.8.4
XS-Python-Version: >= 2.5
Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyside/trunk/
Copied: packages/pyside/trunk/debian/patches/fixDebugPostfix.patch (from rev 12417, packages/pyside/trunk/debian/patches/fixDebugPostix.patch)
===================================================================
--- packages/pyside/trunk/debian/patches/fixDebugPostfix.patch (rev 0)
+++ packages/pyside/trunk/debian/patches/fixDebugPostfix.patch 2010-03-27 10:47:33 UTC (rev 12418)
@@ -0,0 +1,122 @@
+Description: Includes the postfixes in the install target (allows debug build)
+Author: Didier Raboud <didier at raboud.com>
+Origin: vendor
+Forwarded: no (to be done)
+Last-Update: 2010-03-26
+
+Index: pyside-shiboken/PySide/QtCore/CMakeLists.txt
+===================================================================
+--- pyside-shiboken.orig/PySide/QtCore/CMakeLists.txt 2010-03-24 09:44:25.000000000 +0100
++++ pyside-shiboken/PySide/QtCore/CMakeLists.txt 2010-03-24 09:44:42.000000000 +0100
+@@ -149,7 +149,7 @@
+ )
+
+ # 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})
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/pyside_qtcore_python.h
+ DESTINATION include/PySide/QtCore/)
+Index: pyside-shiboken/PySide/QtNetwork/CMakeLists.txt
+===================================================================
+--- pyside-shiboken.orig/PySide/QtNetwork/CMakeLists.txt 2010-03-24 09:44:25.000000000 +0100
++++ pyside-shiboken/PySide/QtNetwork/CMakeLists.txt 2010-03-24 09:45:34.000000000 +0100
+@@ -113,7 +113,7 @@
+ add_dependencies(QtNetwork QtCore)
+
+ # install
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtNetwork.so
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtNetwork${CMAKE_DEBUG_POSTFIX}.so
+ DESTINATION ${SITE_PACKAGE}/PySide)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/pyside_qtnetwork_python.h
+ DESTINATION include/PySide/QtNetwork/)
+Index: pyside-shiboken/PySide/QtSvg/CMakeLists.txt
+===================================================================
+--- pyside-shiboken.orig/PySide/QtSvg/CMakeLists.txt 2010-03-24 09:44:25.000000000 +0100
++++ pyside-shiboken/PySide/QtSvg/CMakeLists.txt 2010-03-24 09:45:59.000000000 +0100
+@@ -56,7 +56,7 @@
+ add_dependencies(QtSvg QtGui)
+
+ # install
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtSvg.so
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtSvg${CMAKE_DEBUG_POSTFIX}.so
+ DESTINATION ${SITE_PACKAGE}/PySide)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/pyside_qtsvg_python.h
+ DESTINATION include/PySide/QtSvg/)
+Index: pyside-shiboken/PySide/QtWebKit/CMakeLists.txt
+===================================================================
+--- pyside-shiboken.orig/PySide/QtWebKit/CMakeLists.txt 2010-03-24 09:44:25.000000000 +0100
++++ pyside-shiboken/PySide/QtWebKit/CMakeLists.txt 2010-03-24 09:46:15.000000000 +0100
+@@ -73,7 +73,7 @@
+ add_dependencies(QtWebKit QtNetwork)
+
+ # install
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtWebKit.so
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtWebKit${CMAKE_DEBUG_POSTFIX}.so
+ DESTINATION ${SITE_PACKAGE}/PySide)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/pyside_qtwebkit_python.h
+ DESTINATION include/PySide/QtWebKit/)
+Index: pyside-shiboken/PySide/QtGui/CMakeLists.txt
+===================================================================
+--- pyside-shiboken.orig/PySide/QtGui/CMakeLists.txt 2010-03-24 09:44:54.000000000 +0100
++++ pyside-shiboken/PySide/QtGui/CMakeLists.txt 2010-03-24 09:45:29.000000000 +0100
+@@ -478,6 +478,6 @@
+ add_dependencies(QtGui QtCore)
+
+ # install
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtGui.so DESTINATION "${SITE_PACKAGE}/PySide")
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtGui${CMAKE_DEBUG_POSTFIX}.so DESTINATION "${SITE_PACKAGE}/PySide")
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/pyside_qtgui_python.h
+ DESTINATION include/PySide/QtGui/)
+Index: pyside-shiboken/PySide/QtOpenGL/CMakeLists.txt
+===================================================================
+--- pyside-shiboken.orig/PySide/QtOpenGL/CMakeLists.txt 2010-03-24 09:44:54.000000000 +0100
++++ pyside-shiboken/PySide/QtOpenGL/CMakeLists.txt 2010-03-24 09:45:45.000000000 +0100
+@@ -45,7 +45,7 @@
+ add_dependencies(QtOpenGL QtGui)
+
+ # install
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtOpenGL.so
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtOpenGL${CMAKE_DEBUG_POSTFIX}.so
+ DESTINATION ${SITE_PACKAGE}/PySide)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtOpenGL/pyside_qtopengl_python.h
+ DESTINATION include/PySide/QtOpenGL/)
+Index: pyside-shiboken/PySide/QtSql/CMakeLists.txt
+===================================================================
+--- pyside-shiboken.orig/PySide/QtSql/CMakeLists.txt 2010-03-24 09:44:54.000000000 +0100
++++ pyside-shiboken/PySide/QtSql/CMakeLists.txt 2010-03-24 09:45:53.000000000 +0100
+@@ -45,7 +45,7 @@
+ add_dependencies(QtSql QtGui)
+
+ # install
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtSql.so
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtSql${CMAKE_DEBUG_POSTFIX}.so
+ DESTINATION ${SITE_PACKAGE}/PySide)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSql/pyside_qtsql_python.h
+ DESTINATION include/PySide/QtSql/)
+Index: pyside-shiboken/PySide/QtTest/CMakeLists.txt
+===================================================================
+--- pyside-shiboken.orig/PySide/QtTest/CMakeLists.txt 2010-03-24 09:44:54.000000000 +0100
++++ pyside-shiboken/PySide/QtTest/CMakeLists.txt 2010-03-24 09:46:11.000000000 +0100
+@@ -45,7 +45,7 @@
+ add_dependencies(QtTest QtGui)
+
+ # install
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtTest.so
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtTest${CMAKE_DEBUG_POSTFIX}.so
+ DESTINATION ${SITE_PACKAGE}/PySide)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/pyside_qttest_python.h
+ DESTINATION include/PySide/QtTest/)
+Index: pyside-shiboken/PySide/QtXml/CMakeLists.txt
+===================================================================
+--- pyside-shiboken.orig/PySide/QtXml/CMakeLists.txt 2010-03-24 09:44:54.000000000 +0100
++++ pyside-shiboken/PySide/QtXml/CMakeLists.txt 2010-03-24 09:46:27.000000000 +0100
+@@ -59,7 +59,7 @@
+ add_dependencies(QtXml QtCore)
+
+ # install
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtXml.so DESTINATION ${SITE_PACKAGE}/PySide)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtXml${CMAKE_DEBUG_POSTFIX}.so DESTINATION ${SITE_PACKAGE}/PySide)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXml/pyside_qtxml_python.h
+ DESTINATION include/PySide/QtXml/)
+
Deleted: packages/pyside/trunk/debian/patches/fixDebugPostix.patch
===================================================================
--- packages/pyside/trunk/debian/patches/fixDebugPostix.patch 2010-03-26 23:29:44 UTC (rev 12417)
+++ packages/pyside/trunk/debian/patches/fixDebugPostix.patch 2010-03-27 10:47:33 UTC (rev 12418)
@@ -1,122 +0,0 @@
-Description: Includes the postfixes in the install target (allows debug build)
-Author: Didier Raboud <didier at raboud.com>
-Origin: vendor
-Forwarded: no (to be done)
-Last-Update: 2010-03-26
-
-Index: pyside-shiboken/PySide/QtCore/CMakeLists.txt
-===================================================================
---- pyside-shiboken.orig/PySide/QtCore/CMakeLists.txt 2010-03-24 09:44:25.000000000 +0100
-+++ pyside-shiboken/PySide/QtCore/CMakeLists.txt 2010-03-24 09:44:42.000000000 +0100
-@@ -149,7 +149,7 @@
- )
-
- # 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})
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/pyside_qtcore_python.h
- DESTINATION include/PySide/QtCore/)
-Index: pyside-shiboken/PySide/QtNetwork/CMakeLists.txt
-===================================================================
---- pyside-shiboken.orig/PySide/QtNetwork/CMakeLists.txt 2010-03-24 09:44:25.000000000 +0100
-+++ pyside-shiboken/PySide/QtNetwork/CMakeLists.txt 2010-03-24 09:45:34.000000000 +0100
-@@ -113,7 +113,7 @@
- add_dependencies(QtNetwork QtCore)
-
- # install
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtNetwork.so
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtNetwork${CMAKE_DEBUG_POSTFIX}.so
- DESTINATION ${SITE_PACKAGE}/PySide)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/pyside_qtnetwork_python.h
- DESTINATION include/PySide/QtNetwork/)
-Index: pyside-shiboken/PySide/QtSvg/CMakeLists.txt
-===================================================================
---- pyside-shiboken.orig/PySide/QtSvg/CMakeLists.txt 2010-03-24 09:44:25.000000000 +0100
-+++ pyside-shiboken/PySide/QtSvg/CMakeLists.txt 2010-03-24 09:45:59.000000000 +0100
-@@ -56,7 +56,7 @@
- add_dependencies(QtSvg QtGui)
-
- # install
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtSvg.so
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtSvg${CMAKE_DEBUG_POSTFIX}.so
- DESTINATION ${SITE_PACKAGE}/PySide)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/pyside_qtsvg_python.h
- DESTINATION include/PySide/QtSvg/)
-Index: pyside-shiboken/PySide/QtWebKit/CMakeLists.txt
-===================================================================
---- pyside-shiboken.orig/PySide/QtWebKit/CMakeLists.txt 2010-03-24 09:44:25.000000000 +0100
-+++ pyside-shiboken/PySide/QtWebKit/CMakeLists.txt 2010-03-24 09:46:15.000000000 +0100
-@@ -73,7 +73,7 @@
- add_dependencies(QtWebKit QtNetwork)
-
- # install
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtWebKit.so
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtWebKit${CMAKE_DEBUG_POSTFIX}.so
- DESTINATION ${SITE_PACKAGE}/PySide)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/pyside_qtwebkit_python.h
- DESTINATION include/PySide/QtWebKit/)
-Index: pyside-shiboken/PySide/QtGui/CMakeLists.txt
-===================================================================
---- pyside-shiboken.orig/PySide/QtGui/CMakeLists.txt 2010-03-24 09:44:54.000000000 +0100
-+++ pyside-shiboken/PySide/QtGui/CMakeLists.txt 2010-03-24 09:45:29.000000000 +0100
-@@ -478,6 +478,6 @@
- add_dependencies(QtGui QtCore)
-
- # install
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtGui.so DESTINATION "${SITE_PACKAGE}/PySide")
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtGui${CMAKE_DEBUG_POSTFIX}.so DESTINATION "${SITE_PACKAGE}/PySide")
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/pyside_qtgui_python.h
- DESTINATION include/PySide/QtGui/)
-Index: pyside-shiboken/PySide/QtOpenGL/CMakeLists.txt
-===================================================================
---- pyside-shiboken.orig/PySide/QtOpenGL/CMakeLists.txt 2010-03-24 09:44:54.000000000 +0100
-+++ pyside-shiboken/PySide/QtOpenGL/CMakeLists.txt 2010-03-24 09:45:45.000000000 +0100
-@@ -45,7 +45,7 @@
- add_dependencies(QtOpenGL QtGui)
-
- # install
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtOpenGL.so
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtOpenGL${CMAKE_DEBUG_POSTFIX}.so
- DESTINATION ${SITE_PACKAGE}/PySide)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtOpenGL/pyside_qtopengl_python.h
- DESTINATION include/PySide/QtOpenGL/)
-Index: pyside-shiboken/PySide/QtSql/CMakeLists.txt
-===================================================================
---- pyside-shiboken.orig/PySide/QtSql/CMakeLists.txt 2010-03-24 09:44:54.000000000 +0100
-+++ pyside-shiboken/PySide/QtSql/CMakeLists.txt 2010-03-24 09:45:53.000000000 +0100
-@@ -45,7 +45,7 @@
- add_dependencies(QtSql QtGui)
-
- # install
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtSql.so
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtSql${CMAKE_DEBUG_POSTFIX}.so
- DESTINATION ${SITE_PACKAGE}/PySide)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSql/pyside_qtsql_python.h
- DESTINATION include/PySide/QtSql/)
-Index: pyside-shiboken/PySide/QtTest/CMakeLists.txt
-===================================================================
---- pyside-shiboken.orig/PySide/QtTest/CMakeLists.txt 2010-03-24 09:44:54.000000000 +0100
-+++ pyside-shiboken/PySide/QtTest/CMakeLists.txt 2010-03-24 09:46:11.000000000 +0100
-@@ -45,7 +45,7 @@
- add_dependencies(QtTest QtGui)
-
- # install
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtTest.so
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtTest${CMAKE_DEBUG_POSTFIX}.so
- DESTINATION ${SITE_PACKAGE}/PySide)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/pyside_qttest_python.h
- DESTINATION include/PySide/QtTest/)
-Index: pyside-shiboken/PySide/QtXml/CMakeLists.txt
-===================================================================
---- pyside-shiboken.orig/PySide/QtXml/CMakeLists.txt 2010-03-24 09:44:54.000000000 +0100
-+++ pyside-shiboken/PySide/QtXml/CMakeLists.txt 2010-03-24 09:46:27.000000000 +0100
-@@ -59,7 +59,7 @@
- add_dependencies(QtXml QtCore)
-
- # install
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtXml.so DESTINATION ${SITE_PACKAGE}/PySide)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtXml${CMAKE_DEBUG_POSTFIX}.so DESTINATION ${SITE_PACKAGE}/PySide)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXml/pyside_qtxml_python.h
- DESTINATION include/PySide/QtXml/)
-
Added: packages/pyside/trunk/debian/patches/fixTests.patch
===================================================================
--- packages/pyside/trunk/debian/patches/fixTests.patch (rev 0)
+++ packages/pyside/trunk/debian/patches/fixTests.patch 2010-03-27 10:47:33 UTC (rev 12418)
@@ -0,0 +1,42 @@
+Description: Blacklist tests that tests inexistant implementations (QtUiTools and Phonon)
+ Also correct a typo
+Author: Didier Raboud <didier at raboud.com>
+Forwarded: yes (IRC)
+Origin: vendor
+Last-Update: 2010-03-27
+
+Index: pyside-qt4.6+0.3.0/tests/CMakeLists.txt
+===================================================================
+--- pyside-qt4.6+0.3.0.orig/tests/CMakeLists.txt 2010-03-27 02:50:37.000000000 +0100
++++ pyside-qt4.6+0.3.0/tests/CMakeLists.txt 2010-03-27 10:55:37.000000000 +0100
+@@ -1,14 +1,15 @@
+
+ file(GLOB TEST_FILES */*_test.py)
+
+-set(test_blacklist )
++# Debian patch : Phonon and QtUiTools have not yet been implemented
++set(test_blacklist phonon_basic_playing phonon_capabilities qtuitools_uiloader qtuitools_ui)
+
+ foreach(test_file ${TEST_FILES})
+ string(REGEX MATCH "/([^/]+)//?([^/]+)_test.py" test_name ${test_file} )
+ list(FIND test_blacklist ${CMAKE_MATCH_1}_${CMAKE_MATCH_2} expect_fail)
+ add_test(${CMAKE_MATCH_1}_${CMAKE_MATCH_2} sh
+ ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh
+- "${pysidebase_BINARY_DIR}"
++ "${pysidebase_BINARY_DIR}:${libpyside_BINARY_DIR}"
+ "${CMAKE_BINARY_DIR}:${CMAKE_CURRENT_SOURCE_DIR}/util"
+ ${PYTHON_EXECUTABLE}
+ ${test_file})
+Index: pyside-qt4.6+0.3.0/tests/qtwebkit/webpage_test.py
+===================================================================
+--- pyside-qt4.6+0.3.0.orig/tests/qtwebkit/webpage_test.py 2010-03-27 10:50:36.000000000 +0100
++++ pyside-qt4.6+0.3.0/tests/qtwebkit/webpage_test.py 2010-03-27 10:51:23.000000000 +0100
+@@ -39,7 +39,7 @@
+ if ok:
+ self.called = True
+
+-class SetNetworkAccessManaterCase(TimedQApplication):
++class SetNetworkAccessManagerCase(TimedQApplication):
+
+ def testSetNetworkAccessManager(self):
+ page = QWebPage()
Copied: packages/pyside/trunk/debian/patches/libPythonVersionPostfix.patch (from rev 12417, packages/pyside/trunk/debian/patches/lib_pythonversionpostfix.patch)
===================================================================
--- packages/pyside/trunk/debian/patches/libPythonVersionPostfix.patch (rev 0)
+++ packages/pyside/trunk/debian/patches/libPythonVersionPostfix.patch 2010-03-27 10:47:33 UTC (rev 12418)
@@ -0,0 +1,32 @@
+Description: Includes the -py2* postfix to the libraries. This allows to build
+ against all python versions.
+Author: Didier Raboud <didier at raboud.com>
+Origin: vendor
+Forwarded: no (not wanted / needed)
+Last-Update: 2010-03-26
+
+Index: pyside-shiboken/libpyside/CMakeLists.txt
+===================================================================
+--- pyside-shiboken.orig/libpyside/CMakeLists.txt 2010-03-24 09:50:11.000000000 +0100
++++ pyside-shiboken/libpyside/CMakeLists.txt 2010-03-24 09:51:37.000000000 +0100
+@@ -6,6 +6,11 @@
+ globalreceiver.cpp
+ )
+
++SET(OLD_CMAKE_DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
++SET(OLD_CMAKE_RELEASE_POSTFIX ${CMAKE_RELEASE_POSTFIX})
++SET(CMAKE_DEBUG_POSTFIX ${LIBPYSIDE_POSTFIX}${CMAKE_DEBUG_POSTFIX})
++SET(CMAKE_RELEASE_POSTFIX ${LIBPYSIDE_POSTFIX}${CMAKE_RELEASE_POSTFIX})
++
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+ ${SHIBOKEN_INCLUDE_DIR}
+ ${PYTHON_INCLUDE_PATH}
+@@ -47,3 +52,8 @@
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide-${BINDING_API_VERSION}")
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySideVersion.cmake"
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide-${BINDING_API_VERSION}")
++
++SET(CMAKE_DEBUG_POSTFIX ${OLD_CMAKE_DEBUG_POSTFIX})
++SET(CMAKE_RELEASE_POSTFIX ${OLD_CMAKE_RELEASE_POSTFIX})
++UNSET(OLD_CMAKE_DEBUG_POSTFIX)
++UNSET(OLD_CMAKE_RELEASE_POSTFIX)
Deleted: packages/pyside/trunk/debian/patches/lib_pythonversionpostfix.patch
===================================================================
--- packages/pyside/trunk/debian/patches/lib_pythonversionpostfix.patch 2010-03-26 23:29:44 UTC (rev 12417)
+++ packages/pyside/trunk/debian/patches/lib_pythonversionpostfix.patch 2010-03-27 10:47:33 UTC (rev 12418)
@@ -1,32 +0,0 @@
-Description: Includes the -py2* postfix to the libraries. This allows to build
- against all python versions.
-Author: Didier Raboud <didier at raboud.com>
-Origin: vendor
-Forwarded: no (not wanted / needed)
-Last-Update: 2010-03-26
-
-Index: pyside-shiboken/libpyside/CMakeLists.txt
-===================================================================
---- pyside-shiboken.orig/libpyside/CMakeLists.txt 2010-03-24 09:50:11.000000000 +0100
-+++ pyside-shiboken/libpyside/CMakeLists.txt 2010-03-24 09:51:37.000000000 +0100
-@@ -6,6 +6,11 @@
- globalreceiver.cpp
- )
-
-+SET(OLD_CMAKE_DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
-+SET(OLD_CMAKE_RELEASE_POSTFIX ${CMAKE_RELEASE_POSTFIX})
-+SET(CMAKE_DEBUG_POSTFIX ${LIBPYSIDE_POSTFIX}${CMAKE_DEBUG_POSTFIX})
-+SET(CMAKE_RELEASE_POSTFIX ${LIBPYSIDE_POSTFIX}${CMAKE_RELEASE_POSTFIX})
-+
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}
- ${SHIBOKEN_INCLUDE_DIR}
- ${PYTHON_INCLUDE_PATH}
-@@ -47,3 +52,8 @@
- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide-${BINDING_API_VERSION}")
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySideVersion.cmake"
- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide-${BINDING_API_VERSION}")
-+
-+SET(CMAKE_DEBUG_POSTFIX ${OLD_CMAKE_DEBUG_POSTFIX})
-+SET(CMAKE_RELEASE_POSTFIX ${OLD_CMAKE_RELEASE_POSTFIX})
-+UNSET(OLD_CMAKE_DEBUG_POSTFIX)
-+UNSET(OLD_CMAKE_RELEASE_POSTFIX)
Modified: packages/pyside/trunk/debian/patches/series
===================================================================
--- packages/pyside/trunk/debian/patches/series 2010-03-26 23:29:44 UTC (rev 12417)
+++ packages/pyside/trunk/debian/patches/series 2010-03-27 10:47:33 UTC (rev 12418)
@@ -1,3 +1,4 @@
fixConvenienceSymlinks.patch
fixDebugPostix.patch
-lib_pythonversionpostfix.patch
+libPythonVersionPostfix.patch
+fixTests.patch
Modified: packages/pyside/trunk/debian/rules
===================================================================
--- packages/pyside/trunk/debian/rules 2010-03-26 23:29:44 UTC (rev 12417)
+++ packages/pyside/trunk/debian/rules 2010-03-27 10:47:33 UTC (rev 12418)
@@ -70,12 +70,11 @@
override_dh_auto_test: $(PYVERSIONS:%=override_dh_auto_test-%)
override_dh_auto_test_dbg-%:
- # Don't be blocking.
- - dh_auto_test --builddirectory=build-$*-dbg
+ xvfb-run -a -s -noreset dh_auto_test --builddirectory=build-$*-dbg
override_dh_auto_test-%:
- # Don't be blocking.
- - dh_auto_test --builddirectory=build-$*
+ # Run tests in fake X Server
+ xvfb-run -a -s -noreset dh_auto_test --builddirectory=build-$*
#### CLEAN ####
override_dh_auto_clean:
More information about the Python-modules-commits
mailing list