[Python-modules-commits] r18348 - in packages/pyside/trunk/debian/patches (2 files)

[odyx at users.alioth.debian.org]

    Date: Friday, August 26, 2011 @ 08:54:05
  Author: odyx
Revision: 18348

Drop patch from upstream, included in point-release.

Modified:
  packages/pyside/trunk/debian/patches/series
Deleted:
  packages/pyside/trunk/debian/patches/u_703b460_Fixed_build_for_Qt_4.6.patch

Modified: packages/pyside/trunk/debian/patches/series
===================================================================
--- packages/pyside/trunk/debian/patches/series	2011-08-26 08:53:46 UTC (rev 18347)
+++ packages/pyside/trunk/debian/patches/series	2011-08-26 08:54:05 UTC (rev 18348)
@@ -1,3 +1,2 @@
-u_703b460_Fixed_build_for_Qt_4.6.patch
 lessBuildVerbosity.patch
 cmake_selectDefaultPython.patch

Deleted: packages/pyside/trunk/debian/patches/u_703b460_Fixed_build_for_Qt_4.6.patch
===================================================================
--- packages/pyside/trunk/debian/patches/u_703b460_Fixed_build_for_Qt_4.6.patch	2011-08-26 08:53:46 UTC (rev 18347)
+++ packages/pyside/trunk/debian/patches/u_703b460_Fixed_build_for_Qt_4.6.patch	2011-08-26 08:54:05 UTC (rev 18348)
@@ -1,40 +0,0 @@
-From 703b4608157ccd3e65c3188d92ff8f514caf5ad1 Mon Sep 17 00:00:00 2001
-From: Renato Filho <renato.filho at openbossa.org>
-Date: Tue, 23 Aug 2011 10:21:38 -0300
-Subject: [PATCH] Fixed build for Qt 4.6.
-
----
- PySide/QtScript/CMakeLists.txt |   10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/PySide/QtScript/CMakeLists.txt b/PySide/QtScript/CMakeLists.txt
-index 88b0a06..024d51f 100644
---- a/PySide/QtScript/CMakeLists.txt
-+++ b/PySide/QtScript/CMakeLists.txt
-@@ -1,10 +1,10 @@
- project(QtScript)
- 
--if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6)
--    set (QtCore_46_SRC )
-+if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 7)
-+    set (QtScript_47_SRC )
- else()
--    set(QtScript_46_SRC
--    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptprogram_wrapper.cpp
-+    set(QtScript_47_SRC
-+        ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptprogram_wrapper.cpp
-     )
- endif()
- 
-@@ -22,7 +22,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptextensionplugin_wrapper.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptstring_wrapper.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptvalue_wrapper.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptvalueiterator_wrapper.cpp
--${QtScript_46_SRC}
-+${QtScript_47_SRC}
- )
- 
- set(QtScript_typesystem_path "${QtCore_SOURCE_DIR}")
--- 
-1.7.2.5
-