[Python-modules-commits] r17869 - in packages/pyside-tools/trunk/debian (5 files)

[odyx at users.alioth.debian.org]

    Date: Monday, July 18, 2011 @ 20:49:46
  Author: odyx
Revision: 17869

Update packaging to 0.2.11:

* Patches:
  - drop fix_tests.patch
  - update u_4125d2d_Fix_pysideuictest.patch
* Add pkg-config, xvfb, xauth, libshiboken-dev and python-pyside.qtgui Build-Deps.
* Run tests in xvfb.

Modified:
  packages/pyside-tools/trunk/debian/control
  packages/pyside-tools/trunk/debian/patches/series
  packages/pyside-tools/trunk/debian/patches/u_4125d2d_Fix_pysideuictest.patch
  packages/pyside-tools/trunk/debian/rules
Deleted:
  packages/pyside-tools/trunk/debian/patches/fix_tests.patch

Modified: packages/pyside-tools/trunk/debian/control
===================================================================
--- packages/pyside-tools/trunk/debian/control	2011-07-17 19:35:23 UTC (rev 17868)
+++ packages/pyside-tools/trunk/debian/control	2011-07-18 20:49:46 UTC (rev 17869)
@@ -7,8 +7,12 @@
  cmake (>= 2.6.0),
  libqt4-dev (>= 4:4.7.0),
  python-all (>= 2.6.6-3~),
+ pkg-config,
+ libshiboken-dev (>= 1.0.4),
+ xvfb, xauth,
  libpyside-dev (>= 1.0.4),
- python-pyside.qtcore (>= 1.0.4)
+ python-pyside.qtcore (>= 1.0.4),
+ python-pyside.qtgui (>= 1.0.4)
 Standards-Version: 3.9.2.0
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyside-tools/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pyside-tools/

Deleted: packages/pyside-tools/trunk/debian/patches/fix_tests.patch
===================================================================
--- packages/pyside-tools/trunk/debian/patches/fix_tests.patch	2011-07-17 19:35:23 UTC (rev 17868)
+++ packages/pyside-tools/trunk/debian/patches/fix_tests.patch	2011-07-18 20:49:46 UTC (rev 17869)
@@ -1,25 +0,0 @@
-Description: Ensure pyside-rcc is in the path.
-Author: Didier Raboud <didier at raboud.com>
-Last-Update: 2010-12-03
---- a/tests/rcc/run_test.sh
-+++ b/tests/rcc/run_test.sh
-@@ -6,8 +6,9 @@
- # $1: python executable
- # $2: python test
- # $3: qrc file
-+# $5: pyside-rcc path
- 
- export PYTHONPATH=$PYTHONPATH:`pwd`
--pyside-rcc -o `basename $3 .qrc`_rc.py $3
-+$5/pyside-rcc -o `basename $3 .qrc`_rc.py $3
- cd $4
- $1 $2
---- a/tests/rcc/CMakeLists.txt
-+++ b/tests/rcc/CMakeLists.txt
-@@ -3,4 +3,5 @@
-                  ${PYTHON_EXECUTABLE}
-                  ${CMAKE_CURRENT_SOURCE_DIR}/rcc_test.py
-                  ${CMAKE_CURRENT_SOURCE_DIR}/example.qrc
--                 ${CMAKE_CURRENT_SOURCE_DIR} )
-+                 ${CMAKE_CURRENT_SOURCE_DIR}
-+                 ${CMAKE_CURRENT_BINARY_DIR}/../../pyrcc/ )

Modified: packages/pyside-tools/trunk/debian/patches/series
===================================================================
--- packages/pyside-tools/trunk/debian/patches/series	2011-07-17 19:35:23 UTC (rev 17868)
+++ packages/pyside-tools/trunk/debian/patches/series	2011-07-18 20:49:46 UTC (rev 17869)
@@ -1,2 +1 @@
 u_4125d2d_Fix_pysideuictest.patch
-fix_tests.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-07-17 19:35:23 UTC (rev 17868)
+++ packages/pyside-tools/trunk/debian/patches/u_4125d2d_Fix_pysideuictest.patch	2011-07-18 20:49:46 UTC (rev 17869)
@@ -20,7 +20,7 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -11,7 +11,13 @@
- set(pyside_tools_MICRO_VERSION "10")
+ set(pyside_tools_MICRO_VERSION "11")
  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)
@@ -52,9 +52,9 @@
  if (NOT win32)
 --- a/tests/CMakeLists.txt
 +++ b/tests/CMakeLists.txt
-@@ -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}")
+@@ -2,4 +2,4 @@
+ add_subdirectory(rcc)
+ add_test(QWizard ${SHIBOKEN_PYTHON_INTERPRETER} ${CMAKE_SOURCE_DIR}/pyside-uic "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui")
+ set_tests_properties(QWizard PROPERTIES
+-                     ENVIRONMENT "PYTHONPATH=$ENV{PYTHONPATH}:${CMAKE_SOURCE_DIR}")
 +                     ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}:$ENV{PYTHONPATH}")

Modified: packages/pyside-tools/trunk/debian/rules
===================================================================
--- packages/pyside-tools/trunk/debian/rules	2011-07-17 19:35:23 UTC (rev 17868)
+++ packages/pyside-tools/trunk/debian/rules	2011-07-18 20:49:46 UTC (rev 17869)
@@ -2,3 +2,7 @@
 
 %:
 	dh --with python2 $@
+
+override_dh_auto_test:
+	# Run tests in fake X Server
+	xvfb-run -a -s -noreset dh_auto_test