[Python-modules-commits] r14008 - in packages/pyside/trunk/debian (3 files)

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

    Date: Tuesday, July 20, 2010 @ 17:13:32
  Author: odyx-guest
Revision: 14008

* Patches:
  + u_c62c36a_fix_qtmultimedia_tests.patch (upstream)
    Fixes the QtMultimedia_audio assertion error.

Added:
  packages/pyside/trunk/debian/patches/u_c62c36a_fix_qtmultimedia_tests.patch
Modified:
  packages/pyside/trunk/debian/changelog
  packages/pyside/trunk/debian/patches/series

Modified: packages/pyside/trunk/debian/changelog
===================================================================
--- packages/pyside/trunk/debian/changelog	2010-07-20 13:19:53 UTC (rev 14007)
+++ packages/pyside/trunk/debian/changelog	2010-07-20 17:13:32 UTC (rev 14008)
@@ -1,5 +1,8 @@
 pyside (0.3.2-4) UNRELEASED; urgency=low
 
+  * Patches:
+    + u_c62c36a_fix_qtmultimedia_tests.patch (upstream)
+      Fixes the QtMultimedia_audio assertion error.
   * Remove custom cmake files in favour of cmake-data's.
    - Remove debian/cmake/*.
    - Bump cmake B-D to 2.8.2
@@ -8,7 +11,7 @@
   * Remove debian/pyversions, which duplicates information from
     debian/control.
 
- -- Didier Raboud <didier at raboud.com>  Thu, 01 Jul 2010 14:09:22 +0200
+ -- Didier Raboud <didier at raboud.com>  Tue, 20 Jul 2010 19:10:41 +0200
 
 pyside (0.3.2-3) unstable; urgency=low
 

Modified: packages/pyside/trunk/debian/patches/series
===================================================================
--- packages/pyside/trunk/debian/patches/series	2010-07-20 13:19:53 UTC (rev 14007)
+++ packages/pyside/trunk/debian/patches/series	2010-07-20 17:13:32 UTC (rev 14008)
@@ -1,5 +1,6 @@
 u_5ce7c94_fix_qtnetwork_udpsocket_test.patch
 u_86d0f67_fix_debug_build.patch
+u_c62c36a_fix_qtmultimedia_tests.patch
 libPythonVersionPostfix.patch
 fixTests.patch
 usePySpecificShiboken.patch

Added: packages/pyside/trunk/debian/patches/u_c62c36a_fix_qtmultimedia_tests.patch
===================================================================
--- packages/pyside/trunk/debian/patches/u_c62c36a_fix_qtmultimedia_tests.patch	                        (rev 0)
+++ packages/pyside/trunk/debian/patches/u_c62c36a_fix_qtmultimedia_tests.patch	2010-07-20 17:13:32 UTC (rev 14008)
@@ -0,0 +1,28 @@
+From c62c36a64dd4c0fc0cd586c5c2b3d4f97ba3f769 Mon Sep 17 00:00:00 2001
+From: Luciano Wolf <luciano.wolf at openbossa.org>
+Date: Wed, 14 Jul 2010 18:38:13 -0300
+Subject: [PATCH] Fix CMakeLists to include QtMultimedia tests + fix audio test.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+Reviewer: Renato Araújo <renato.filho at openbossa.org>
+          Marcelo Lira <marcelo.lira at openbossa.org>
+---
+ tests/CMakeLists.txt             |   12 ++++++++++++
+ tests/qtmultimedia/audio_test.py |    2 ++
+ 2 files changed, 14 insertions(+), 0 deletions(-)
+
+Index: pyside/tests/qtmultimedia/audio_test.py
+===================================================================
+--- pyside.orig/tests/qtmultimedia/audio_test.py	2010-06-03 16:24:14.000000000 +0200
++++ pyside/tests/qtmultimedia/audio_test.py	2010-07-20 19:09:29.000000000 +0200
+@@ -10,6 +10,8 @@
+ 
+     def testListDevices(self):
+         for devInfo in QAudioDeviceInfo.availableDevices(QAudio.AudioOutput):
++            if devInfo.deviceName() == 'null':
++                continue
+             fmt = QAudioFormat()
+             for codec in devInfo.supportedCodecs():
+                 fmt.setCodec(codec)