[Python-modules-commits] r14138 - in packages/pyside/trunk/debian (changelog)

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

    Date: Thursday, August 5, 2010 @ 14:35:48
  Author: odyx-guest
Revision: 14138

Merge the two UNRELEASED changelogs

Modified:
  packages/pyside/trunk/debian/changelog

Modified: packages/pyside/trunk/debian/changelog
===================================================================
--- packages/pyside/trunk/debian/changelog	2010-08-05 14:34:45 UTC (rev 14137)
+++ packages/pyside/trunk/debian/changelog	2010-08-05 14:35:48 UTC (rev 14138)
@@ -10,24 +10,10 @@
        Drop, was from upstream
     - u_86d0f67_fix_debug_build.patch
        Drop, was from upstream
-    - u_c62c36a_fix_qtmultimedia_tests.patch
-       Drop, was from upstream
     - fixTests.patch
        Drop as upstream changed the tests handling completely
     × Refresh the others
 
-  * Put the cmake config and pkg-config file in libpyside-dev, add necessary
-    Breaks/Replaces.
-  * Install the typesystem files in libpyside-dev.
-  * Bump Standards to 3.9.1.0 without changes needed.
-
- -- Didier Raboud <didier at raboud.com>  Thu, 05 Aug 2010 16:33:53 +0200
-
-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
@@ -36,6 +22,10 @@
    - Remove mentions of the BSD license of cmake in debian/copyright
   * Remove debian/pyversions, which duplicates information from
     debian/control.
+  * Put the cmake config and pkg-config file in libpyside-dev, add necessary
+    Breaks/Replaces.
+  * Install the typesystem files in libpyside-dev.
+  * Bump Standards to 3.9.1.0 without changes needed.
 
  -- Didier Raboud <didier at raboud.com>  Tue, 20 Jul 2010 19:10:41 +0200