[Python-modules-commits] r13282 - in packages/pyside/trunk/debian (9 files)
odyx-guest at users.alioth.debian.org
odyx-guest at users.alioth.debian.org
Sun Jun 6 17:20:28 UTC 2010
Date: Sunday, June 6, 2010 @ 17:20:17
Author: odyx-guest
Revision: 13282
Remove all upstream patches that got merged upstream:
u_fixConvenienceSymlinks_792456c.patch
u_fixDebugPostfix_d9b1898.patch
u_fixLinking_4326368.patch
u_fixtestQtWebkitTest_17d9eed.patch
Modified:
packages/pyside/trunk/debian/changelog
packages/pyside/trunk/debian/patches/fixTests.patch
packages/pyside/trunk/debian/patches/libPythonVersionPostfix.patch
packages/pyside/trunk/debian/patches/series
Deleted:
packages/pyside/trunk/debian/patches/disableGccOptimizations.patch
packages/pyside/trunk/debian/patches/u_fixConvenienceSymlinks_792456c.patch
packages/pyside/trunk/debian/patches/u_fixDebugPostfix_d9b1898.patch
packages/pyside/trunk/debian/patches/u_fixLinking_4326368.patch
packages/pyside/trunk/debian/patches/u_fixtestQtWebkitTest_17d9eed.patch
Modified: packages/pyside/trunk/debian/changelog
===================================================================
--- packages/pyside/trunk/debian/changelog 2010-06-06 17:11:49 UTC (rev 13281)
+++ packages/pyside/trunk/debian/changelog 2010-06-06 17:20:17 UTC (rev 13282)
@@ -3,14 +3,15 @@
* New 0.3.2 upstream release
* Patches:
- - Re-order the series (upstream's, then Debian's)
- - Add disableGccOptimizations.patch to make sure we get the
- correct options (this should fix the mips{,el} FTBFS).
- - Mark some symbols as optional because of this.
+ - Remove all upstream patches that got merged upstream:
+ u_fixConvenienceSymlinks_792456c.patch
+ u_fixDebugPostfix_d9b1898.patch
+ u_fixLinking_4326368.patch
+ u_fixtestQtWebkitTest_17d9eed.patch
* Override lintian warnings for the -dbg package.
- -- Didier Raboud <didier at raboud.com> Sun, 06 Jun 2010 19:11:33 +0200
+ -- Didier Raboud <didier at raboud.com> Sun, 06 Jun 2010 19:18:05 +0200
pyside (0.3.1-2) unstable; urgency=low
Deleted: packages/pyside/trunk/debian/patches/disableGccOptimizations.patch
===================================================================
--- packages/pyside/trunk/debian/patches/disableGccOptimizations.patch 2010-06-06 17:11:49 UTC (rev 13281)
+++ packages/pyside/trunk/debian/patches/disableGccOptimizations.patch 2010-06-06 17:20:17 UTC (rev 13282)
@@ -1,25 +0,0 @@
-Description: Allow pushing custom build options
- Also remove linker-specific options.
- This patch is more-or-less already upstream with
- http://qt.gitorious.org/pyside/pyside-shiboken/commit/0eb416d487ae381a78fe99498a5217e9f24d7413
-Author: Didier Raboud <didier at raboud.com>
-Origin: vendor
-Forwarded: not needed (distributor customization)
-Last-Update: 2010-05-30
-Index: pyside/CMakeLists.txt
-===================================================================
---- pyside.orig/CMakeLists.txt 2010-05-30 19:30:16.000000000 +0200
-+++ pyside/CMakeLists.txt 2010-05-30 21:43:44.000000000 +0200
-@@ -4,8 +4,10 @@
-
- cmake_minimum_required(VERSION 2.6)
-
--set(CMAKE_CXX_FLAGS_RELEASE "-Wall -DNDEBUG -Os -Wl,-O1 -Wl,--hash-style=gnu -Wno-strict-aliasing -fvisibility=hidden")
--set(CMAKE_CXX_FLAGS_DEBUG "-g -fno-common -Wall -fno-strict-aliasing -fvisibility=hidden")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fvisibility=hidden -fno-strict-aliasing")
-+
-+set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG")
-+set(CMAKE_CXX_FLAGS_DEBUG "-g")
-
- if (NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE Release)
Modified: packages/pyside/trunk/debian/patches/fixTests.patch
===================================================================
--- packages/pyside/trunk/debian/patches/fixTests.patch 2010-06-06 17:11:49 UTC (rev 13281)
+++ packages/pyside/trunk/debian/patches/fixTests.patch 2010-06-06 17:20:17 UTC (rev 13282)
@@ -1,16 +1,16 @@
-Description: Make sure the tests use the currently built libpyside
+Description:
* Extend timeout to 25
* Blacklist some modules
Author: Didier Raboud <didier at raboud.com>
Forwarded: http://bugs.openbossa.org/214
Origin: vendor
-Last-Update: 2010-05-10
+Last-Update: 2010-06-06
Index: pyside/tests/CMakeLists.txt
===================================================================
---- pyside.orig/tests/CMakeLists.txt 2010-05-27 22:59:25.000000000 +0200
-+++ pyside/tests/CMakeLists.txt 2010-05-27 22:59:49.000000000 +0200
-@@ -1,21 +1,29 @@
+--- pyside.orig/tests/CMakeLists.txt 2010-06-06 19:13:22.000000000 +0200
++++ pyside/tests/CMakeLists.txt 2010-06-06 19:16:19.000000000 +0200
+@@ -1,10 +1,17 @@
file(GLOB TEST_FILES */*_test.py)
@@ -29,8 +29,7 @@
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}"
+@@ -12,10 +19,11 @@
"${CMAKE_BINARY_DIR}:${CMAKE_CURRENT_SOURCE_DIR}/util"
${PYTHON_EXECUTABLE}
${test_file})
Modified: packages/pyside/trunk/debian/patches/libPythonVersionPostfix.patch
===================================================================
--- packages/pyside/trunk/debian/patches/libPythonVersionPostfix.patch 2010-06-06 17:11:49 UTC (rev 13281)
+++ packages/pyside/trunk/debian/patches/libPythonVersionPostfix.patch 2010-06-06 17:20:17 UTC (rev 13282)
@@ -7,10 +7,10 @@
Index: pyside/libpyside/CMakeLists.txt
===================================================================
---- pyside.orig/libpyside/CMakeLists.txt 2010-05-10 13:07:43.000000000 +0200
-+++ pyside/libpyside/CMakeLists.txt 2010-05-10 13:07:50.000000000 +0200
-@@ -6,6 +6,11 @@
- globalreceiver.cpp
+--- pyside.orig/libpyside/CMakeLists.txt 2010-06-03 16:24:14.000000000 +0200
++++ pyside/libpyside/CMakeLists.txt 2010-06-06 19:12:41.000000000 +0200
+@@ -9,6 +9,11 @@
+ pyside.cpp
)
+SET(OLD_CMAKE_DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
@@ -21,7 +21,7 @@
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${SHIBOKEN_INCLUDE_DIR}
${PYTHON_INCLUDE_PATH}
-@@ -48,3 +53,8 @@
+@@ -52,3 +57,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}")
Modified: packages/pyside/trunk/debian/patches/series
===================================================================
--- packages/pyside/trunk/debian/patches/series 2010-06-06 17:11:49 UTC (rev 13281)
+++ packages/pyside/trunk/debian/patches/series 2010-06-06 17:20:17 UTC (rev 13282)
@@ -1,8 +1,2 @@
-u_fixConvenienceSymlinks_792456c.patch
-u_fixDebugPostfix_d9b1898.patch
-u_fixtestQtWebkitTest_17d9eed.patch
-u_fixLinking_4326368.patch
libPythonVersionPostfix.patch
fixTests.patch
-disableGccOptimizations.patch
-noTestsTimeout.patch
Deleted: packages/pyside/trunk/debian/patches/u_fixConvenienceSymlinks_792456c.patch
===================================================================
--- packages/pyside/trunk/debian/patches/u_fixConvenienceSymlinks_792456c.patch 2010-06-06 17:11:49 UTC (rev 13281)
+++ packages/pyside/trunk/debian/patches/u_fixConvenienceSymlinks_792456c.patch 2010-06-06 17:20:17 UTC (rev 13282)
@@ -1,26 +0,0 @@
-From 792456c8e4271b97183428b22e84d9498cfaa2dc Mon Sep 17 00:00:00 2001
-From: Renato Filho <renato.filho at openbossa.org>
-Date: Thu, 20 May 2010 19:01:41 -0300
-Subject: [PATCH] Fix convenience symlinks used during install by appending the
-
-Author: Didier Raboud <didier at raboud.com>
-
-Reviewer: Hugo Parente Lima <hugo.lima at openbossa.org>,
- Luciano Wolf <luciano.wolf at openbossa.org>
----
- PySide/CMakeLists.txt | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-Index: pyside/PySide/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/CMakeLists.txt 2010-05-27 22:44:39.000000000 +0200
-+++ pyside/PySide/CMakeLists.txt 2010-05-27 22:44:41.000000000 +0200
-@@ -23,7 +23,7 @@
- else()
- if (${var})
- add_subdirectory(${name})
-- execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_BINARY_DIR}/${name}/${name}${CMAKE_SHARED_MODULE_SUFFIX}"
-+ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_BINARY_DIR}/${name}/${name}${CMAKE_DEBUG_POSTFIX}${CMAKE_SHARED_MODULE_SUFFIX}"
- "${CMAKE_BINARY_DIR}/PySide/${name}${CMAKE_SHARED_MODULE_SUFFIX}")
- else()
- message(STATUS "${name} NOT found. ${name} support disabled.")
Deleted: packages/pyside/trunk/debian/patches/u_fixDebugPostfix_d9b1898.patch
===================================================================
--- packages/pyside/trunk/debian/patches/u_fixDebugPostfix_d9b1898.patch 2010-06-06 17:11:49 UTC (rev 13281)
+++ packages/pyside/trunk/debian/patches/u_fixDebugPostfix_d9b1898.patch 2010-06-06 17:20:17 UTC (rev 13282)
@@ -1,249 +0,0 @@
-From d9be18983480567acc800258c1a2b05e0af8ab03 Mon Sep 17 00:00:00 2001
-From: Renato Filho <renato.filho at openbossa.org>
-Date: Thu, 20 May 2010 19:01:00 -0300
-Subject: [PATCH] Includes the postfixes in the install target (allows debug build)
-
-Author: Didier Raboud <didier at raboud.com>
-
-Reviewer: Hugo Parente Lima <hugo.lima at openbossa.org>,
- Luciano Wolf <luciano.wolf at openbossa.org>
----
- PySide/QtCore/CMakeLists.txt | 2 +-
- PySide/QtGui/CMakeLists.txt | 2 +-
- PySide/QtHelp/CMakeLists.txt | 2 +-
- PySide/QtMaemo5/CMakeLists.txt | 2 +-
- PySide/QtMultimedia/CMakeLists.txt | 2 +-
- PySide/QtNetwork/CMakeLists.txt | 2 +-
- PySide/QtOpenGL/CMakeLists.txt | 2 +-
- PySide/QtScript/CMakeLists.txt | 2 +-
- PySide/QtScriptTools/CMakeLists.txt | 2 +-
- PySide/QtSql/CMakeLists.txt | 2 +-
- PySide/QtSvg/CMakeLists.txt | 2 +-
- PySide/QtTest/CMakeLists.txt | 2 +-
- PySide/QtUiTools/CMakeLists.txt | 2 +-
- PySide/QtWebKit/CMakeLists.txt | 2 +-
- PySide/QtXml/CMakeLists.txt | 2 +-
- PySide/QtXmlPatterns/CMakeLists.txt | 2 +-
- PySide/phonon/CMakeLists.txt | 2 +-
- 17 files changed, 17 insertions(+), 17 deletions(-)
-
-Index: pyside/PySide/QtCore/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/QtCore/CMakeLists.txt 2010-05-27 22:44:39.000000000 +0200
-+++ pyside/PySide/QtCore/CMakeLists.txt 2010-05-27 22:45:10.000000000 +0200
-@@ -151,7 +151,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/PySide/QtGui/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/QtGui/CMakeLists.txt 2010-05-27 22:44:39.000000000 +0200
-+++ pyside/PySide/QtGui/CMakeLists.txt 2010-05-27 22:45:10.000000000 +0200
-@@ -491,6 +491,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/PySide/QtHelp/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/QtHelp/CMakeLists.txt 2010-05-27 22:44:39.000000000 +0200
-+++ pyside/PySide/QtHelp/CMakeLists.txt 2010-05-27 22:45:10.000000000 +0200
-@@ -40,7 +40,7 @@
- add_dependencies(QtHelp QtGui)
-
- # install
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtHelp.so
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtHelp${CMAKE_DEBUG_POSTFIX}.so
- DESTINATION ${SITE_PACKAGE}/PySide)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtHelp/pyside_qthelp_python.h
- DESTINATION include/PySide/QtHelp/)
-Index: pyside/PySide/QtMaemo5/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/QtMaemo5/CMakeLists.txt 2010-05-27 22:44:39.000000000 +0200
-+++ pyside/PySide/QtMaemo5/CMakeLists.txt 2010-05-27 22:45:10.000000000 +0200
-@@ -49,7 +49,7 @@
- #add_dependencies(QtMaemo5)
-
- # install
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtMaemo5.so
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtMaemo5${CMAKE_DEBUG_POSTFIX}.so
- DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMaemo5/pyside_qtmaemo5_python.h
-Index: pyside/PySide/QtMultimedia/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/QtMultimedia/CMakeLists.txt 2010-05-27 22:44:39.000000000 +0200
-+++ pyside/PySide/QtMultimedia/CMakeLists.txt 2010-05-27 22:45:10.000000000 +0200
-@@ -39,7 +39,7 @@
- add_dependencies(QtMultimedia QtGui)
-
- # install
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtMultimedia.so
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtMultimedia${CMAKE_DEBUG_POSTFIX}.so
- DESTINATION ${SITE_PACKAGE}/PySide)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/pyside_qtmultimedia_python.h
- DESTINATION include/PySide/QtMultimedia/)
-Index: pyside/PySide/QtNetwork/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/QtNetwork/CMakeLists.txt 2010-05-27 22:44:39.000000000 +0200
-+++ pyside/PySide/QtNetwork/CMakeLists.txt 2010-05-27 22:45:10.000000000 +0200
-@@ -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/PySide/QtOpenGL/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/QtOpenGL/CMakeLists.txt 2010-05-27 22:44:39.000000000 +0200
-+++ pyside/PySide/QtOpenGL/CMakeLists.txt 2010-05-27 22:45:10.000000000 +0200
-@@ -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/PySide/QtScript/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/QtScript/CMakeLists.txt 2010-05-27 22:44:39.000000000 +0200
-+++ pyside/PySide/QtScript/CMakeLists.txt 2010-05-27 22:45:10.000000000 +0200
-@@ -48,7 +48,7 @@
- add_dependencies(QtScript QtCore)
-
- # install
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtScript.so DESTINATION ${SITE_PACKAGE}/PySide)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtScript${CMAKE_DEBUG_POSTFIX}.so DESTINATION ${SITE_PACKAGE}/PySide)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/pyside_qtscript_python.h
- DESTINATION include/PySide/QtScript/)
-
-Index: pyside/PySide/QtScriptTools/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/QtScriptTools/CMakeLists.txt 2010-05-27 22:44:39.000000000 +0200
-+++ pyside/PySide/QtScriptTools/CMakeLists.txt 2010-05-27 22:45:10.000000000 +0200
-@@ -33,7 +33,7 @@
- add_dependencies(QtScriptTools QtCore QtScript QtGui)
-
- # install
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtScriptTools.so
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtScriptTools${CMAKE_DEBUG_POSTFIX}.so
- DESTINATION ${SITE_PACKAGE}/PySide)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScriptTools/pyside_qtscripttools_python.h
- DESTINATION include/PySide/QtScriptTools/)
-Index: pyside/PySide/QtSql/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/QtSql/CMakeLists.txt 2010-05-27 22:44:39.000000000 +0200
-+++ pyside/PySide/QtSql/CMakeLists.txt 2010-05-27 22:45:10.000000000 +0200
-@@ -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/PySide/QtSvg/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/QtSvg/CMakeLists.txt 2010-05-27 22:44:39.000000000 +0200
-+++ pyside/PySide/QtSvg/CMakeLists.txt 2010-05-27 22:45:10.000000000 +0200
-@@ -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/PySide/QtTest/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/QtTest/CMakeLists.txt 2010-05-27 22:44:39.000000000 +0200
-+++ pyside/PySide/QtTest/CMakeLists.txt 2010-05-27 22:45:10.000000000 +0200
-@@ -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/PySide/QtUiTools/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/QtUiTools/CMakeLists.txt 2010-05-27 22:44:39.000000000 +0200
-+++ pyside/PySide/QtUiTools/CMakeLists.txt 2010-05-27 22:45:10.000000000 +0200
-@@ -33,7 +33,7 @@
- add_dependencies(QtUiTools QtGui QtXml)
-
- # install
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtUiTools.so
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtUiTools${CMAKE_DEBUG_POSTFIX}.so
- DESTINATION ${SITE_PACKAGE}/PySide)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtUiTools/pyside_qtuitools_python.h
- DESTINATION include/PySide/QtUiTools/)
-Index: pyside/PySide/QtWebKit/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/QtWebKit/CMakeLists.txt 2010-05-27 22:44:39.000000000 +0200
-+++ pyside/PySide/QtWebKit/CMakeLists.txt 2010-05-27 22:45:10.000000000 +0200
-@@ -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/PySide/QtXml/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/QtXml/CMakeLists.txt 2010-05-27 22:44:39.000000000 +0200
-+++ pyside/PySide/QtXml/CMakeLists.txt 2010-05-27 22:45:10.000000000 +0200
-@@ -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/)
-
-Index: pyside/PySide/QtXmlPatterns/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/QtXmlPatterns/CMakeLists.txt 2010-05-27 22:44:39.000000000 +0200
-+++ pyside/PySide/QtXmlPatterns/CMakeLists.txt 2010-05-27 22:45:10.000000000 +0200
-@@ -46,7 +46,7 @@
- ${QT_QTXMLPATTERNS_LIBRARY})
- add_dependencies(QtXmlPatterns QtCore)
- # install
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtXmlPatterns.so
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtXmlPatterns${CMAKE_DEBUG_POSTFIX}.so
- DESTINATION ${SITE_PACKAGE}/PySide)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXmlPatterns/pyside_qtxmlpatterns_python.h
- DESTINATION include/PySide/QtXmlPatterns/)
-Index: pyside/PySide/phonon/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/phonon/CMakeLists.txt 2010-05-27 22:44:39.000000000 +0200
-+++ pyside/PySide/phonon/CMakeLists.txt 2010-05-27 22:45:10.000000000 +0200
-@@ -62,7 +62,7 @@
- add_dependencies(phonon QtGui)
-
- # install
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/phonon.so
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/phonon${CMAKE_DEBUG_POSTFIX}.so
- DESTINATION ${SITE_PACKAGE}/PySide)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/pyside_phonon_python.h
- DESTINATION include/PySide/phonon/)
Deleted: packages/pyside/trunk/debian/patches/u_fixLinking_4326368.patch
===================================================================
--- packages/pyside/trunk/debian/patches/u_fixLinking_4326368.patch 2010-06-06 17:11:49 UTC (rev 13281)
+++ packages/pyside/trunk/debian/patches/u_fixLinking_4326368.patch 2010-06-06 17:20:17 UTC (rev 13282)
@@ -1,86 +0,0 @@
-From 43263681e7ba8f74dc7150cd049774350718bf84 Mon Sep 17 00:00:00 2001
-From: Renato Filho <renato.filho at openbossa.org>
-Date: Tue, 18 May 2010 18:41:36 -0300
-Subject: [PATCH] Fix dynamic linking in various modules.
-
-Author: Didier Raboud <didier at raboud.com>
-
-Reviewer: Hugo Parente Lima <hugo.lima at openbossa.org>,
- Luciano Wolf <luciano.wolf at openbossa.org>
----
- PySide/QtMultimedia/CMakeLists.txt | 1 +
- PySide/QtSvg/CMakeLists.txt | 1 +
- PySide/QtTest/CMakeLists.txt | 2 +-
- PySide/QtUiTools/CMakeLists.txt | 1 -
- PySide/QtWebKit/CMakeLists.txt | 2 ++
- 5 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/PySide/QtMultimedia/CMakeLists.txt b/PySide/QtMultimedia/CMakeLists.txt
-index 03e5934..ea1b75c 100644
---- a/PySide/QtMultimedia/CMakeLists.txt
-+++ b/PySide/QtMultimedia/CMakeLists.txt
-@@ -35,6 +35,7 @@ target_link_libraries(QtMultimedia
- ${PYTHON_LIBRARIES}
- ${SHIBOKEN_LIBRARY}
- ${QT_QTMULTIMEDIA_LIBRARY}
-+ ${QT_QTGUI_LIBRARY}
- )
- add_dependencies(QtMultimedia QtGui)
-
-diff --git a/PySide/QtSvg/CMakeLists.txt b/PySide/QtSvg/CMakeLists.txt
-index 2efa803..2935127 100644
---- a/PySide/QtSvg/CMakeLists.txt
-+++ b/PySide/QtSvg/CMakeLists.txt
-@@ -52,6 +52,7 @@ target_link_libraries(QtSvg
- ${PYTHON_LIBRARIES}
- ${SHIBOKEN_LIBRARY}
- ${QT_QTSVG_LIBRARY}
-+ ${QT_QTGUI_LIBRARY}
- )
- add_dependencies(QtSvg QtGui)
-
-diff --git a/PySide/QtTest/CMakeLists.txt b/PySide/QtTest/CMakeLists.txt
-index aae9bb9..bfb23f5 100644
---- a/PySide/QtTest/CMakeLists.txt
-+++ b/PySide/QtTest/CMakeLists.txt
-@@ -36,11 +36,11 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
- add_library(QtTest MODULE ${QtTest_SRC})
- set_property(TARGET QtTest PROPERTY PREFIX "")
- target_link_libraries(QtTest
-- pyside
- ${PYTHON_LIBRARIES}
- ${SHIBOKEN_LIBRARY}
- ${QT_QTTEST_LIBRARY}
- ${QT_QTGUI_LIBRARY}
-+ ${QT_QTCORE_LIBRARY}
- )
- add_dependencies(QtTest QtGui)
-
-diff --git a/PySide/QtUiTools/CMakeLists.txt b/PySide/QtUiTools/CMakeLists.txt
-index 1145f97..1d07c89 100644
---- a/PySide/QtUiTools/CMakeLists.txt
-+++ b/PySide/QtUiTools/CMakeLists.txt
-@@ -27,7 +27,6 @@ target_link_libraries(QtUiTools
- ${PYTHON_LIBRARIES}
- ${QT_QTCORE_LIBRARY}
- ${QT_QTGUI_LIBRARY}
-- ${QT_QTXML_LIBRARY}
- ${QT_QTUITOOLS_LIBRARY})
-
- add_dependencies(QtUiTools QtGui QtXml)
-diff --git a/PySide/QtWebKit/CMakeLists.txt b/PySide/QtWebKit/CMakeLists.txt
-index 82c550c..71b62ed 100644
---- a/PySide/QtWebKit/CMakeLists.txt
-+++ b/PySide/QtWebKit/CMakeLists.txt
-@@ -68,6 +68,8 @@ target_link_libraries(QtWebKit
- ${PYTHON_LIBRARIES}
- ${SHIBOKEN_LIBRARY}
- ${QT_QTWEBKIT_LIBRARY}
-+ ${QT_QTNETWORK_LIBRARY}
-+ ${QT_QTGUI_LIBRARY}
- )
- add_dependencies(QtWebKit QtGui)
- add_dependencies(QtWebKit QtNetwork)
---
-1.6.1
-
Deleted: packages/pyside/trunk/debian/patches/u_fixtestQtWebkitTest_17d9eed.patch
===================================================================
--- packages/pyside/trunk/debian/patches/u_fixtestQtWebkitTest_17d9eed.patch 2010-06-06 17:11:49 UTC (rev 13281)
+++ packages/pyside/trunk/debian/patches/u_fixtestQtWebkitTest_17d9eed.patch 2010-06-06 17:20:17 UTC (rev 13282)
@@ -1,80 +0,0 @@
-From 17f9eed1ad5d04603872f198876047466ba08666 Mon Sep 17 00:00:00 2001
-From: Luciano Wolf <luciano.wolf at openbossa.org>
-Date: Thu, 20 May 2010 22:07:17 -0300
-Subject: [PATCH] Fix bug#218 - TimedQApplication uses a singleton.
-
-It's necessary to use a global TIMEOUT value, big enough to run
-all the tests without killing the QApp.
-
-Reviewer: Hugo Parente Lima <hugo.lima at openbossa.org>
- Renato Araujo <renato.araujo at openbossa.org>
----
- tests/qtwebkit/webpage_test.py | 19 +++++++++++++------
- tests/qtwebkit/webview_test.py | 2 +-
- 2 files changed, 14 insertions(+), 7 deletions(-)
-
-diff --git a/tests/qtwebkit/webpage_test.py b/tests/qtwebkit/webpage_test.py
-index ed98c9f..2079697 100644
---- a/tests/qtwebkit/webpage_test.py
-+++ b/tests/qtwebkit/webpage_test.py
-@@ -9,11 +9,15 @@ from PySide.QtNetwork import QNetworkAccessManager
-
- from helper import adjust_filename, TimedQApplication
-
-+#Define a global timeout because TimedQApplication uses a singleton!
-+#Use a value big enough to run all the tests.
-+TIMEOUT = 1000
-+
- class TestFindText(TimedQApplication):
- '''Test cases for finding text'''
-
- def setUp(self):
-- TimedQApplication.setUp(self, timeout=250)
-+ TimedQApplication.setUp(self, timeout=TIMEOUT)
- self.page = QWebPage()
- QObject.connect(self.page, SIGNAL('loadFinished(bool)'),
- self.load_finished)
-@@ -27,19 +31,22 @@ class TestFindText(TimedQApplication):
-
- def testFindSelectText(self):
- url = QUrl.fromLocalFile(adjust_filename('fox.html', __file__))
-- self.page.currentFrame().setUrl(url)
-+ self.page.mainFrame().load(url)
- self.app.exec_()
- self.assert_(self.called)
-
- def load_finished(self, ok):
- #Callback to check if load was successful
-- self.assert_(self.page.findText('fox'))
-- self.assertEqual(self.page.selectedText(), 'fox')
-- self.app.quit()
- if ok:
- self.called = True
-+ self.assert_(self.page.findText('fox'))
-+ self.assertEqual(self.page.selectedText(), 'fox')
-+ self.app.quit()
-
--class SetNetworkAccessManaterCase(TimedQApplication):
-+class SetNetworkAccessManagerCase(TimedQApplication):
-+
-+ def setUp(self):
-+ TimedQApplication.setUp(self, timeout=TIMEOUT)
-
- def testSetNetworkAccessManager(self):
- page = QWebPage()
-diff --git a/tests/qtwebkit/webview_test.py b/tests/qtwebkit/webview_test.py
-index 176d487..e1ba7ef 100644
---- a/tests/qtwebkit/webview_test.py
-+++ b/tests/qtwebkit/webview_test.py
-@@ -14,7 +14,7 @@ class TestLoadFinished(TimedQApplication):
-
- def setUp(self):
- #Acquire resources
-- TimedQApplication.setUp(self, timeout=250)
-+ TimedQApplication.setUp(self, timeout=1000)
- self.view = QWebView()
- QObject.connect(self.view, SIGNAL('loadFinished(bool)'),
- self.load_finished)
---
-1.6.1
-
More information about the Python-modules-commits
mailing list