[Python-modules-commits] r16323 - in packages/pyside-tools/trunk/debian/patches (1 file)

[odyx at users.alioth.debian.org]

    Date: Sunday, April 3, 2011 @ 16:29:37
  Author: odyx
Revision: 16323

Refresh patches.

Modified:
  packages/pyside-tools/trunk/debian/patches/u_4125d2d_Fix_pysideuictest.patch

Modified: packages/pyside-tools/trunk/debian/patches/u_4125d2d_Fix_pysideuictest.patch
===================================================================
--- packages/pyside-tools/trunk/debian/patches/u_4125d2d_Fix_pysideuictest.patch	2011-04-03 16:29:17 UTC (rev 16322)
+++ packages/pyside-tools/trunk/debian/patches/u_4125d2d_Fix_pysideuictest.patch	2011-04-03 16:29:37 UTC (rev 16323)
@@ -17,12 +17,10 @@
  tests/CMakeLists.txt |    2 +-
  2 files changed, 10 insertions(+), 8 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index beb4c26..8d70269 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -11,7 +11,13 @@ set(pyside_tools_MINOR_VERSION "2")
- set(pyside_tools_MICRO_VERSION "7")
+@@ -11,7 +11,13 @@
+ set(pyside_tools_MICRO_VERSION "8")
  set(pyside_tools_VERSION "${pyside_tools_MAJOR_VERSION}.${pyside_tools_MINOR_VERSION}.${pyside_tools_MICRO_VERSION}")
  
 -configure_file("pysideuic/__init__.py.in" "__init__.py" @ONLY)
@@ -36,7 +34,7 @@
  
  option(BUILD_TESTS "Build tests." TRUE)
  
-@@ -34,13 +40,9 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pyside-uic
+@@ -34,13 +40,9 @@
          GROUP_EXECUTE GROUP_READ
          WORLD_EXECUTE WORLD_READ)
  
@@ -52,16 +50,11 @@
  
  # Man pages for pyside-uic
  if (NOT win32)
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 16342a2..1b9912b 100644
 --- a/tests/CMakeLists.txt
 +++ b/tests/CMakeLists.txt
-@@ -3,4 +3,4 @@ add_subdirectory(rcc)
+@@ -3,4 +3,4 @@
  
  add_test("test_qwizard" ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/pyside-uic "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui")
  set_tests_properties("test_qwizard" PROPERTIES
 -                     ENVIRONMENT "PYTHONPATH=${CMAKE_SOURCE_DIR}")
 +                     ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}:$ENV{PYTHONPATH}")
--- 
-1.6.1
-