[Python-modules-commits] r13536 - in packages/pyside/trunk/debian (4 files)

[odyx-guest at users.alioth.debian.org]

    Date: Tuesday, June 22, 2010 @ 07:26:37
  Author: odyx-guest
Revision: 13536

* Patches from upstream:
  + u_86d0f67_fix_debug_build.patch
    This fixes the debug build.

Modified:
  packages/pyside/trunk/debian/changelog
  packages/pyside/trunk/debian/patches/lessBuildVerbosity.patch
  packages/pyside/trunk/debian/patches/series
  packages/pyside/trunk/debian/rules

Modified: packages/pyside/trunk/debian/changelog
===================================================================
--- packages/pyside/trunk/debian/changelog	2010-06-22 07:20:30 UTC (rev 13535)
+++ packages/pyside/trunk/debian/changelog	2010-06-22 07:26:37 UTC (rev 13536)
@@ -1,12 +1,14 @@
 pyside (0.3.2-3) unstable; urgency=low
 
-  * Patches:
+  * Patches from upstream:
     + u_5ce7c94_fix_qtnetwork_udpsocket_test.patch
       This fixes the QtNetwork_udpsocket test to work on offline
       machines, like our buildds.
+    + u_86d0f67_fix_debug_build.patch
+      This fixes the debug build.
     × Refresh fixTests.patch to remove the meaningless testnumbers.
 
- -- Didier Raboud <didier at raboud.com>  Tue, 22 Jun 2010 09:19:21 +0200
+ -- Didier Raboud <didier at raboud.com>  Tue, 22 Jun 2010 09:22:40 +0200
 
 pyside (0.3.2-2) unstable; urgency=low
 

Modified: packages/pyside/trunk/debian/patches/lessBuildVerbosity.patch
===================================================================
--- packages/pyside/trunk/debian/patches/lessBuildVerbosity.patch	2010-06-22 07:20:30 UTC (rev 13535)
+++ packages/pyside/trunk/debian/patches/lessBuildVerbosity.patch	2010-06-22 07:26:37 UTC (rev 13536)
@@ -1,9 +1,9 @@
 Index: pyside/CMakeLists.txt
 ===================================================================
---- pyside.orig/CMakeLists.txt	2010-06-18 12:08:04.000000000 +0200
-+++ pyside/CMakeLists.txt	2010-06-18 12:08:31.000000000 +0200
-@@ -122,7 +122,7 @@
-     message(FATAL_ERROR "Could not detect Python module installation directory.")
+--- pyside.orig/CMakeLists.txt	2010-06-22 09:22:21.000000000 +0200
++++ pyside/CMakeLists.txt	2010-06-22 09:22:23.000000000 +0200
+@@ -132,7 +132,7 @@
+     add_definitions("-DPy_DEBUG")
  endif()
  
 -set(GENERATOR_EXTRA_FLAGS --generatorSet=shiboken --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic)

Modified: packages/pyside/trunk/debian/patches/series
===================================================================
--- packages/pyside/trunk/debian/patches/series	2010-06-22 07:20:30 UTC (rev 13535)
+++ packages/pyside/trunk/debian/patches/series	2010-06-22 07:26:37 UTC (rev 13536)
@@ -1,4 +1,5 @@
 u_5ce7c94_fix_qtnetwork_udpsocket_test.patch
+u_86d0f67_fix_debug_build.patch
 libPythonVersionPostfix.patch
 fixTests.patch
 lessBuildVerbosity.patch

Modified: packages/pyside/trunk/debian/rules
===================================================================
--- packages/pyside/trunk/debian/rules	2010-06-22 07:20:30 UTC (rev 13535)
+++ packages/pyside/trunk/debian/rules	2010-06-22 07:26:37 UTC (rev 13536)
@@ -64,7 +64,7 @@
 override_dh_auto_test: $(PYVERSIONS:%=override_dh_auto_test_dbg-%) $(PYVERSIONS:%=override_dh_auto_test-%)
 
 override_dh_auto_test_dbg-%:
-	# Run tests in fake X Server (they all fail)
+	# Run tests in fake X Server in a non-blocking way
 	- xvfb-run -a -s -noreset dh_auto_test --builddirectory=build-$*-dbg
 
 override_dh_auto_test-%: