[Python-modules-commits] r13604 - in packages/pyside/trunk/debian (7 files)

odyx-guest at users.alioth.debian.org odyx-guest at users.alioth.debian.org
Thu Jun 24 19:25:15 UTC 2010 

    Date: Thursday, June 24, 2010 @ 19:25:13
  Author: odyx-guest
Revision: 13604

Fix the debug build + update to new shiboken-dbg

Added:
  packages/pyside/trunk/debian/patches/u_86d0f67_fix_debug_build.patch
  packages/pyside/trunk/debian/patches/usePySpecificShiboken.patch
Modified:
  packages/pyside/trunk/debian/changelog
  packages/pyside/trunk/debian/control
  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-24 18:39:15 UTC (rev 13603)
+++ packages/pyside/trunk/debian/changelog	2010-06-24 19:25:13 UTC (rev 13604)
@@ -1,15 +1,20 @@
 pyside (0.3.2-3) unstable; urgency=low
 
-  * Patches from upstream:
-    + u_5ce7c94_fix_qtnetwork_udpsocket_test.patch
+  * Patches:
+    + u_5ce7c94_fix_qtnetwork_udpsocket_test.patch (upstream)
       This fixes the QtNetwork_udpsocket test to work on offline
       machines, like our buildds.
-    + u_86d0f67_fix_debug_build.patch
+    + u_86d0f67_fix_debug_build.patch (upstream)
       This fixes the debug build.
+    + usePySpecificShiboken.patch
+      This ensures that the correct python version is used consistantly.
+    × Refresh lessBuildVerbosity.patch
     × Refresh fixTests.patch to remove the meaningless testnumbers.
 
- -- Didier Raboud <didier at raboud.com>  Tue, 22 Jun 2010 09:22:40 +0200
+  * Add shiboken-dbg version-specific B-D.
 
+ -- Didier Raboud <didier at raboud.com>  Thu, 24 Jun 2010 21:24:02 +0200
+
 pyside (0.3.2-2) unstable; urgency=low
 
   * Run all tests but don't make them critical.

Modified: packages/pyside/trunk/debian/control
===================================================================
--- packages/pyside/trunk/debian/control	2010-06-24 18:39:15 UTC (rev 13603)
+++ packages/pyside/trunk/debian/control	2010-06-24 19:25:13 UTC (rev 13604)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 7.4.12~), cmake (>= 2.6.0), dpkg-dev (>= 1.15.6),
 	python-all-dev (>= 2.3.5-11), python-all-dbg (>= 2.3.5-11), python-support (>= 0.3.9),
 	libqt4-dev, libphonon-dev, libqt4-opengl-dev,
-	shiboken (>= 0.3.2), libshiboken-dev (>= 0.3.2),
+	shiboken (>= 0.3.2), libshiboken-dev (>= 0.3.2), shiboken-dbg (>= 0.3.2-2),
 	generatorrunner (>= 0.5.0),
 	libqt4-sql-sqlite, xvfb, xauth,
 	phonon-backend-gstreamer

Modified: packages/pyside/trunk/debian/patches/lessBuildVerbosity.patch
===================================================================
--- packages/pyside/trunk/debian/patches/lessBuildVerbosity.patch	2010-06-24 18:39:15 UTC (rev 13603)
+++ packages/pyside/trunk/debian/patches/lessBuildVerbosity.patch	2010-06-24 19:25:13 UTC (rev 13604)
@@ -1,13 +1,18 @@
+Description: Reduce the verbosity of generatorrunner
+Author: Didier Raboud <didier at raboud.com>
+Origin: vendor
+Forwarded: http://bugs.openbossa.org/249
+Last-Update: 2010-06-23
 Index: pyside/CMakeLists.txt
 ===================================================================
---- pyside.orig/CMakeLists.txt	2010-06-22 09:22:21.000000000 +0200
-+++ pyside/CMakeLists.txt	2010-06-22 09:22:23.000000000 +0200
+--- pyside.orig/CMakeLists.txt	2010-06-24 18:30:59.000000000 +0200
++++ pyside/CMakeLists.txt	2010-06-24 18:31:30.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)
-+set(GENERATOR_EXTRA_FLAGS --generatorSet=shiboken --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic --silent)
+-set(GENERATOR_EXTRA_FLAGS --generatorSet=/usr/lib/generatorrunner/shiboken_generator${SHIBOKEN_POSTFIX}.so --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic)
++set(GENERATOR_EXTRA_FLAGS --generatorSet=/usr/lib/generatorrunner/shiboken_generator${SHIBOKEN_POSTFIX}.so --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic --silent)
  
  enable_testing()
  

Modified: packages/pyside/trunk/debian/patches/series
===================================================================
--- packages/pyside/trunk/debian/patches/series	2010-06-24 18:39:15 UTC (rev 13603)
+++ packages/pyside/trunk/debian/patches/series	2010-06-24 19:25:13 UTC (rev 13604)
@@ -2,4 +2,5 @@
 u_86d0f67_fix_debug_build.patch
 libPythonVersionPostfix.patch
 fixTests.patch
+usePySpecificShiboken.patch
 lessBuildVerbosity.patch

Added: packages/pyside/trunk/debian/patches/u_86d0f67_fix_debug_build.patch
===================================================================
--- packages/pyside/trunk/debian/patches/u_86d0f67_fix_debug_build.patch	                        (rev 0)
+++ packages/pyside/trunk/debian/patches/u_86d0f67_fix_debug_build.patch	2010-06-24 19:25:13 UTC (rev 13604)
@@ -0,0 +1,32 @@
+From 86d0f6715ed282f7fecf789a85feb03d913ea7d9 Mon Sep 17 00:00:00 2001
+From: Hugo Parente Lima <hugo.pl at gmail.com>
+Date: Mon, 21 Jun 2010 14:10:10 -0300
+Subject: [PATCH] Fix bug: "Debug build fails to run the tests (doesn't work) [_Py_AddToAllObjects: Assertion (...) failed]"
+
+Reviewer: Marcelo Lira <marcelo.lira at openbossa.org>
+          Luciano Wolf <luciano.wolf at openbossa.org>
+---
+ CMakeLists.txt |   10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+Index: pyside/CMakeLists.txt
+===================================================================
+--- pyside.orig/CMakeLists.txt	2010-06-21 13:52:14.000000000 +0200
++++ pyside/CMakeLists.txt	2010-06-22 09:21:45.000000000 +0200
+@@ -122,6 +122,16 @@
+     message(FATAL_ERROR "Could not detect Python module installation directory.")
+ endif()
+ 
++# Detect if the python libs were compiled in debug mode
++execute_process(
++    COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; \\
++        print sysconfig.get_config_var('Py_DEBUG')"
++    OUTPUT_VARIABLE PY_DEBUG
++    OUTPUT_STRIP_TRAILING_WHITESPACE)
++if (PY_DEBUG)
++    add_definitions("-DPy_DEBUG")
++endif()
++
+ set(GENERATOR_EXTRA_FLAGS --generatorSet=shiboken --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic)
+ 
+ enable_testing()

Added: packages/pyside/trunk/debian/patches/usePySpecificShiboken.patch
===================================================================
--- packages/pyside/trunk/debian/patches/usePySpecificShiboken.patch	                        (rev 0)
+++ packages/pyside/trunk/debian/patches/usePySpecificShiboken.patch	2010-06-24 19:25:13 UTC (rev 13604)
@@ -0,0 +1,13 @@
+Index: pyside/CMakeLists.txt
+===================================================================
+--- pyside.orig/CMakeLists.txt	2010-06-24 18:30:28.000000000 +0200
++++ pyside/CMakeLists.txt	2010-06-24 18:34:45.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)
++set(GENERATOR_EXTRA_FLAGS --generatorSet=/usr/lib/generatorrunner/shiboken_generator${SHIBOKEN_POSTFIX}.so --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic)
+ 
+ enable_testing()
+ 

Modified: packages/pyside/trunk/debian/rules
===================================================================
--- packages/pyside/trunk/debian/rules	2010-06-24 18:39:15 UTC (rev 13603)
+++ packages/pyside/trunk/debian/rules	2010-06-24 19:25:13 UTC (rev 13604)
@@ -22,7 +22,7 @@
 	-DCMAKE_PYTHONLIB_VERSION="$*_d;$*" \
 	-DCMAKE_DEBUG_POSTFIX=_d \
 	-DLIBPYSIDE_POSTFIX=$(shell echo -py$* | sed -e 's/\.//g' -) \
-	-DSHIBOKEN_POSTFIX=$(shell echo -py$* | sed -e 's/\.//g' -)
+	-DSHIBOKEN_POSTFIX=$(shell echo -py$*_d | sed -e 's/\.//g' -)
 
 override_dh_auto_configure-%:
 	mkdir -p build-$*

More information about the Python-modules-commits mailing list