[Python-modules-commits] r12847 - in packages/pyside/trunk/debian (8 files)
odyx-guest at users.alioth.debian.org
odyx-guest at users.alioth.debian.org
Mon May 10 16:29:06 UTC 2010
Date: Monday, May 10, 2010 @ 16:29:05
Author: odyx-guest
Revision: 12847
Update patches and enable debug build
Modified:
packages/pyside/trunk/debian/changelog
packages/pyside/trunk/debian/control
packages/pyside/trunk/debian/patches/fixDebugPostfix.patch
packages/pyside/trunk/debian/patches/fixLinking.patch
packages/pyside/trunk/debian/patches/fixTests.patch
packages/pyside/trunk/debian/patches/series
packages/pyside/trunk/debian/rules
Deleted:
packages/pyside/trunk/debian/patches/fixConvenienceSymlinks.patch
Modified: packages/pyside/trunk/debian/changelog
===================================================================
--- packages/pyside/trunk/debian/changelog 2010-05-10 14:50:08 UTC (rev 12846)
+++ packages/pyside/trunk/debian/changelog 2010-05-10 16:29:05 UTC (rev 12847)
@@ -21,7 +21,6 @@
* Patches: remove all previous (new codebase), add new:
+ fixDebugPostix.patch: include debug postfix'ed files
+ libPythonVersionPostfix.patch: append -py* to the libraries
- + fixConvenienceSymlinks.patch: correctly symlink postfix'ed files
+ fixTests.patch: Correct LD_PRELOAD_PATH and blacklist some tests
+ fixLinking.patch: Get coherent linking troughout the plugins
Modified: packages/pyside/trunk/debian/control
===================================================================
--- packages/pyside/trunk/debian/control 2010-05-10 14:50:08 UTC (rev 12846)
+++ packages/pyside/trunk/debian/control 2010-05-10 16:29:05 UTC (rev 12847)
@@ -8,10 +8,12 @@
libqt4-dev, libphonon-dev, libqt4-opengl-dev,
shiboken (>= 0.3.1), libshiboken-dev (>= 0.3.1),
generatorrunner (>= 0.4.2),
- libqt4-sql-sqlite, xvfb, xauth
+ libqt4-sql-sqlite, xvfb, xauth,
+ phonon-backend-gstreamer
# Various Build-Depends are needed for success of the testsuite:
# libqt4-sql-sqlite is needed because we need one sql driver.
# xvfb and xauth are needed to run a fake X Server
+# phonon-backend-gstreamer is needed to test phonon
Standards-Version: 3.8.4
XS-Python-Version: >= 2.5
Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyside/trunk/
Deleted: packages/pyside/trunk/debian/patches/fixConvenienceSymlinks.patch
===================================================================
--- packages/pyside/trunk/debian/patches/fixConvenienceSymlinks.patch 2010-05-10 14:50:08 UTC (rev 12846)
+++ packages/pyside/trunk/debian/patches/fixConvenienceSymlinks.patch 2010-05-10 16:29:05 UTC (rev 12847)
@@ -1,19 +0,0 @@
-Description: Fix convenience symlinks used during install by appending the
- POSTFIXes to them. This permits debug build.
-Author: Didier Raboud <didier at raboud.com>
-Origin: vendor
-Forwarded: no (to be done)
-
-Index: pyside/PySide/CMakeLists.txt
-===================================================================
---- pyside.orig/PySide/CMakeLists.txt 2010-05-04 16:50:30.000000000 +0200
-+++ pyside/PySide/CMakeLists.txt 2010-05-06 14:50:17.000000000 +0200
-@@ -23,7 +23,7 @@
- else()
- if (${var})
- add_subdirectory(${name})
-- execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_BINARY_DIR}/${name}/${name}${CMAKE_SHARED_MODULE_SUFFIX}"
-+ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_BINARY_DIR}/${name}/${name}${CMAKE_DEBUG_POSTFIX}${CMAKE_SHARED_MODULE_SUFFIX}"
- "${CMAKE_BINARY_DIR}/PySide/${name}${CMAKE_SHARED_MODULE_SUFFIX}")
- else()
- message(STATUS "${name} NOT found. ${name} support disabled.")
Modified: packages/pyside/trunk/debian/patches/fixDebugPostfix.patch
===================================================================
--- packages/pyside/trunk/debian/patches/fixDebugPostfix.patch 2010-05-10 14:50:08 UTC (rev 12846)
+++ packages/pyside/trunk/debian/patches/fixDebugPostfix.patch 2010-05-10 16:29:05 UTC (rev 12847)
@@ -1,9 +1,22 @@
Description: Includes the postfixes in the install target (allows debug build)
Author: Didier Raboud <didier at raboud.com>
Origin: vendor
-Forwarded: no (to be done)
-Last-Update: 2010-03-26
+Forwarded: http://bugs.openbossa.org/213
+Last-Update: 2010-05-10
+Index: pyside/PySide/CMakeLists.txt
+===================================================================
+--- pyside.orig/PySide/CMakeLists.txt 2010-05-04 16:50:30.000000000 +0200
++++ pyside/PySide/CMakeLists.txt 2010-05-06 14:50:17.000000000 +0200
+@@ -23,7 +23,7 @@
+ else()
+ if (${var})
+ add_subdirectory(${name})
+- execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_BINARY_DIR}/${name}/${name}${CMAKE_SHARED_MODULE_SUFFIX}"
++ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_BINARY_DIR}/${name}/${name}${CMAKE_DEBUG_POSTFIX}${CMAKE_SHARED_MODULE_SUFFIX}"
+ "${CMAKE_BINARY_DIR}/PySide/${name}${CMAKE_SHARED_MODULE_SUFFIX}")
+ else()
+ message(STATUS "${name} NOT found. ${name} support disabled.")
Index: pyside/PySide/QtCore/CMakeLists.txt
===================================================================
--- pyside.orig/PySide/QtCore/CMakeLists.txt 2010-05-06 14:51:53.000000000 +0200
Modified: packages/pyside/trunk/debian/patches/fixLinking.patch
===================================================================
--- packages/pyside/trunk/debian/patches/fixLinking.patch 2010-05-10 14:50:08 UTC (rev 12846)
+++ packages/pyside/trunk/debian/patches/fixLinking.patch 2010-05-10 16:29:05 UTC (rev 12847)
@@ -2,6 +2,7 @@
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
===================================================================
Modified: packages/pyside/trunk/debian/patches/fixTests.patch
===================================================================
--- packages/pyside/trunk/debian/patches/fixTests.patch 2010-05-10 14:50:08 UTC (rev 12846)
+++ packages/pyside/trunk/debian/patches/fixTests.patch 2010-05-10 16:29:05 UTC (rev 12847)
@@ -1,15 +1,15 @@
Description: Make sure the tests use the currently built libpyside
Also correct a typo
Author: Didier Raboud <didier at raboud.com>
-Forwarded: yes (IRC)
+Forwarded: http://bugs.openbossa.org/214
Origin: vendor
-Last-Update: 2010-03-27
+Last-Update: 2010-05-10
Index: pyside/tests/CMakeLists.txt
===================================================================
--- pyside.orig/tests/CMakeLists.txt 2010-05-10 15:14:45.000000000 +0200
-+++ pyside/tests/CMakeLists.txt 2010-05-10 15:15:57.000000000 +0200
-@@ -1,14 +1,20 @@
++++ pyside/tests/CMakeLists.txt 2010-05-10 16:57:00.000000000 +0200
+@@ -1,14 +1,16 @@
file(GLOB TEST_FILES */*_test.py)
@@ -17,14 +17,10 @@
+# Debian patch
+# blacklist non-compiled tests: qtmaemo5*
+set(test_blacklist qtmaemo5_qmaemo5import )
-+# blacklist unknown-error tests: phonon_basic_playing
-+set(test_dontrun_blacklist phonon_basic_playing )
foreach(test_file ${TEST_FILES})
string(REGEX MATCH "/([^/]+)//?([^/]+)_test.py" test_name ${test_file} )
list(FIND test_blacklist ${CMAKE_MATCH_1}_${CMAKE_MATCH_2} expect_fail)
-+ list(FIND test_dontrun_blacklist ${CMAKE_MATCH_1}_${CMAKE_MATCH_2} dont_run)
-+ if(${dont_run} EQUAL -1)
add_test(${CMAKE_MATCH_1}_${CMAKE_MATCH_2} sh
${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh
- "${pysidebase_BINARY_DIR}"
@@ -32,14 +28,6 @@
"${CMAKE_BINARY_DIR}:${CMAKE_CURRENT_SOURCE_DIR}/util"
${PYTHON_EXECUTABLE}
${test_file})
-@@ -16,6 +22,7 @@
- if (${expect_fail} GREATER -1)
- set_tests_properties(${CMAKE_MATCH_1}_${CMAKE_MATCH_2} PROPERTIES WILL_FAIL TRUE)
- endif(${expect_fail} GREATER -1)
-+ endif(${dont_run} EQUAL -1)
- # Should set python path here
- # Looks like it's fixed in 2.8:
- # http://www.vtk.org/Bug/print_bug_page.php?bug_id=7885
Index: pyside/tests/qtwebkit/webpage_test.py
===================================================================
--- pyside.orig/tests/qtwebkit/webpage_test.py 2010-05-10 15:14:45.000000000 +0200
Modified: packages/pyside/trunk/debian/patches/series
===================================================================
--- packages/pyside/trunk/debian/patches/series 2010-05-10 14:50:08 UTC (rev 12846)
+++ packages/pyside/trunk/debian/patches/series 2010-05-10 16:29:05 UTC (rev 12847)
@@ -1,4 +1,3 @@
-fixConvenienceSymlinks.patch
fixDebugPostfix.patch
libPythonVersionPostfix.patch
fixTests.patch
Modified: packages/pyside/trunk/debian/rules
===================================================================
--- packages/pyside/trunk/debian/rules 2010-05-10 14:50:08 UTC (rev 12846)
+++ packages/pyside/trunk/debian/rules 2010-05-10 16:29:05 UTC (rev 12847)
@@ -9,8 +9,7 @@
#### CONFIGURE ####
-## DBG: override_dh_auto_configure: $(PYVERSIONS:%=override_dh_auto_configure_dbg-%) $(PYVERSIONS:%=override_dh_auto_configure-%)
-override_dh_auto_configure: $(PYVERSIONS:%=override_dh_auto_configure-%)
+override_dh_auto_configure: $(PYVERSIONS:%=override_dh_auto_configure_dbg-%) $(PYVERSIONS:%=override_dh_auto_configure-%)
override_dh_auto_configure_dbg-%:
mkdir -p build-$*-dbg
@@ -37,8 +36,7 @@
#### BUILD ####
-## DBG: override_dh_auto_build: $(PYVERSIONS:%=override_dh_auto_build_dbg-%) $(PYVERSIONS:%=override_dh_auto_build-%)
-override_dh_auto_build: $(PYVERSIONS:%=override_dh_auto_build-%)
+override_dh_auto_build: $(PYVERSIONS:%=override_dh_auto_build_dbg-%) $(PYVERSIONS:%=override_dh_auto_build-%)
override_dh_auto_build_dbg-%:
dh_auto_build --builddirectory=build-$*-dbg
@@ -48,8 +46,7 @@
#### INSTALL ####
-## DBG: override_dh_auto_install: $(PYVERSIONS:%=override_dh_auto_install_dbg-%) $(PYVERSIONS:%=override_dh_auto_install-%)
-override_dh_auto_install: $(PYVERSIONS:%=override_dh_auto_install-%)
+override_dh_auto_install: $(PYVERSIONS:%=override_dh_auto_install_dbg-%) $(PYVERSIONS:%=override_dh_auto_install-%)
override_dh_auto_install_dbg-%:
dh_auto_install --builddirectory=build-$*-dbg --destdir=debian/tmp-dbg
@@ -61,15 +58,11 @@
override_dh_strip:
dh_strip --dbg-package=python-pyside-dbg --exclude=_d.so
-#### Symbols ####
-#override_dh_shlibdeps:
-# dh_shlibdeps -Llibpyside0 -Lpython-pyside.qtcore -Lpython-pyside-dbg
-
#### TEST ####
-## DBG: override_dh_auto_test: $(PYVERSIONS:%=override_dh_auto_test_dbg-%) $(PYVERSIONS:%=override_dh_auto_test-%)
-override_dh_auto_test: $(PYVERSIONS:%=override_dh_auto_test-%)
+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
xvfb-run -a -s -noreset dh_auto_test --builddirectory=build-$*-dbg
override_dh_auto_test-%:
@@ -87,20 +80,20 @@
override_dh_install: override_dh_install_last
override_dh_install_first:
-# Move the debug .so's right in place
-## DBG: $(shell rename 's/(debian\/tmp-dbg\/)(.*)\.so(.*)$$/debian\/tmp\/$$2.so$$3/'\
-## DBG: debian/tmp-dbg/usr/lib/python*/*-packages/PySide/*.so)
-## DBG: $(shell rename 's/(debian\/tmp-dbg\/)(.*)\.so(.*)$$/debian\/tmp\/$$2.so$$3/'\
-## DBG: debian/tmp-dbg/usr/lib/*.so*)
-# Setup the default version symbolic links
+ # Move the debug .so's right in place
+ $(shell rename 's/(debian\/tmp-dbg\/)(.*)\.so(.*)$$/debian\/tmp\/$$2.so$$3/'\
+ debian/tmp-dbg/usr/lib/python*/*-packages/PySide/*.so)
+ $(shell rename 's/(debian\/tmp-dbg\/)(.*)\.so(.*)$$/debian\/tmp\/$$2.so$$3/'\
+ debian/tmp-dbg/usr/lib/*.so*)
+ # Setup the default version symbolic links
$(shell ln -s libpyside`echo -py${DEFAULT_PY} | sed -e 's/\.//g' -`.so \
- debian/tmp/usr/lib/libpyside.so )
+ debian/tmp/usr/lib/libpyside.so )
override_dh_install_real: override_dh_install_first
-# Do the legacy install
+ # Do the legacy install
dh_install --list-missing
override_dh_install_last: override_dh_install_real
-# Move the debug library to the correct package.
-## DBG: $(shell rename 's/(debian\/libpyside0\/)(.*)_d\.so(.*)$$/debian\/python-pyside-dbg\/$$2_d.so$$3/' \
-## DBG: debian/libpyside0/usr/lib/*_d.so*)
+ # Move the debug library to the correct package.
+ $(shell rename 's/(debian\/libpyside0\/)(.*)_d\.so(.*)$$/debian\/python-pyside-dbg\/$$2_d.so$$3/' \
+ debian/libpyside0/usr/lib/*_d.so*)
More information about the Python-modules-commits
mailing list