[Python-modules-commits] r13111 - in packages/pyside/trunk/debian (4 files)
odyx-guest at users.alioth.debian.org
odyx-guest at users.alioth.debian.org
Thu May 27 17:57:09 UTC 2010
Date: Thursday, May 27, 2010 @ 17:57:04
Author: odyx-guest
Revision: 13111
Rename+update patch incorporated upstream
Added:
packages/pyside/trunk/debian/patches/u_fixLinking_4326368.patch
(from rev 13107, packages/pyside/trunk/debian/patches/fixLinking.patch)
Modified:
packages/pyside/trunk/debian/changelog
packages/pyside/trunk/debian/patches/series
Deleted:
packages/pyside/trunk/debian/patches/fixLinking.patch
Modified: packages/pyside/trunk/debian/changelog
===================================================================
--- packages/pyside/trunk/debian/changelog 2010-05-27 17:53:53 UTC (rev 13110)
+++ packages/pyside/trunk/debian/changelog 2010-05-27 17:57:04 UTC (rev 13111)
@@ -1,3 +1,10 @@
+pyside (0.3.1-2) UNRELEASED; urgency=low
+
+ * Patches: Update patches that got merged upstream:
+ - fix_Linking.patch -> u_fixLinking_4326368.patch
+
+ -- Didier Raboud <didier at raboud.com> Thu, 27 May 2010 19:49:08 +0200
+
pyside (0.3.1-1) UNRELEASED; urgency=low
* New 0.3.1 upstream release
Deleted: packages/pyside/trunk/debian/patches/fixLinking.patch
===================================================================
--- packages/pyside/trunk/debian/patches/fixLinking.patch 2010-05-27 17:53:53 UTC (rev 13110)
+++ packages/pyside/trunk/debian/patches/fixLinking.patch 2010-05-27 17:57:04 UTC (rev 13111)
@@ -1,76 +0,0 @@
-Description: Fix dynamic linking in various modules (remove some and add
- some), to be coherent with the inner working.
-Author: Didier Raboud <didier at raboud.com>
-Origin: vendor
-Forwarded: http://bugs.openbossa.org/215
-Last-Updated: 2010-05-10
-Index: pyside/PySide/QtUiTools/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/QtUiTools/CMakeLists.txt 2010-05-10 15:16:19.000000000 +0200
-+++ pyside/PySide/QtUiTools/CMakeLists.txt 2010-05-10 15:16:26.000000000 +0200
-@@ -27,10 +27,9 @@
- ${PYTHON_LIBRARIES}
- ${QT_QTCORE_LIBRARY}
- ${QT_QTGUI_LIBRARY}
-- ${QT_QTXML_LIBRARY}
- ${QT_QTUITOOLS_LIBRARY})
-
--add_dependencies(QtUiTools QtGui QtXml)
-+add_dependencies(QtUiTools QtGui)
-
- # install
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtUiTools${CMAKE_DEBUG_POSTFIX}.so
-Index: pyside/PySide/QtWebKit/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/QtWebKit/CMakeLists.txt 2010-05-10 15:16:19.000000000 +0200
-+++ pyside/PySide/QtWebKit/CMakeLists.txt 2010-05-10 15:16:26.000000000 +0200
-@@ -67,6 +67,8 @@
- pyside
- ${PYTHON_LIBRARIES}
- ${SHIBOKEN_LIBRARY}
-+ ${QT_QTGUI_LIBRARY}
-+ ${QT_QTNETWORK_LIBRARY}
- ${QT_QTWEBKIT_LIBRARY}
- )
- add_dependencies(QtWebKit QtGui)
-Index: pyside/PySide/QtMultimedia/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/QtMultimedia/CMakeLists.txt 2010-05-10 15:16:19.000000000 +0200
-+++ pyside/PySide/QtMultimedia/CMakeLists.txt 2010-05-10 15:16:26.000000000 +0200
-@@ -35,6 +35,7 @@
- ${PYTHON_LIBRARIES}
- ${SHIBOKEN_LIBRARY}
- ${QT_QTMULTIMEDIA_LIBRARY}
-+ ${QT_QTGUI_LIBRARY}
- )
- add_dependencies(QtMultimedia QtGui)
-
-Index: pyside/PySide/QtSvg/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/QtSvg/CMakeLists.txt 2010-05-10 15:16:19.000000000 +0200
-+++ pyside/PySide/QtSvg/CMakeLists.txt 2010-05-10 15:16:26.000000000 +0200
-@@ -52,6 +52,7 @@
- ${PYTHON_LIBRARIES}
- ${SHIBOKEN_LIBRARY}
- ${QT_QTSVG_LIBRARY}
-+ ${QT_QTGUI_LIBRARY}
- )
- add_dependencies(QtSvg QtGui)
-
-Index: pyside/PySide/QtTest/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/QtTest/CMakeLists.txt 2010-05-10 15:25:22.000000000 +0200
-+++ pyside/PySide/QtTest/CMakeLists.txt 2010-05-10 15:33:06.000000000 +0200
-@@ -36,11 +36,11 @@
- 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)
-
Modified: packages/pyside/trunk/debian/patches/series
===================================================================
--- packages/pyside/trunk/debian/patches/series 2010-05-27 17:53:53 UTC (rev 13110)
+++ packages/pyside/trunk/debian/patches/series 2010-05-27 17:57:04 UTC (rev 13111)
@@ -1,4 +1,4 @@
fixDebugPostfix.patch
libPythonVersionPostfix.patch
fixTests.patch
-fixLinking.patch
+u_fixLinking_4326368.patch
Copied: packages/pyside/trunk/debian/patches/u_fixLinking_4326368.patch (from rev 13107, packages/pyside/trunk/debian/patches/fixLinking.patch)
===================================================================
--- packages/pyside/trunk/debian/patches/u_fixLinking_4326368.patch (rev 0)
+++ packages/pyside/trunk/debian/patches/u_fixLinking_4326368.patch 2010-05-27 17:57:04 UTC (rev 13111)
@@ -0,0 +1,86 @@
+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
+
More information about the Python-modules-commits
mailing list