[SCM] QtWebKit packaging branch, master, updated. debian/2.1.0-2011week13-2-26-g95b5835

[Pino Toscano]

The following commit has been merged in the master branch:
commit f9ee22510dfdd353f6b4d8d835fd4104e0a5e319
Author: Pino Toscano <pino at debian.org>
Date:   Tue Sep 20 20:02:42 2011 +0200

    fold the wilrdcard stuff into the drop of those b-d
---
 debian/changelog |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b0eea9c..9c85659 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,9 +10,6 @@ qtwebkit (2.2.0~rc1-1) UNRELEASED; urgency=low
       enabled
 
   [ Pino Toscano ]
-  * Use wildcard architectures: (Closes: #634388)
-    - !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 -> linux-any
-    - kfreebsd-i386 kfreebsd-amd64 hurd-i386 -> !linux-any
   * Add -gstabs to the C(XX)FLAGS also for s390x. (see #637004)
 
   [ Fathi Boudra ]
@@ -21,8 +18,9 @@ qtwebkit (2.2.0~rc1-1) UNRELEASED; urgency=low
     - bump Qt build dependency to 4:4.7.4~. This version introduce multiarch.
     - add pkg-config, libgstreamer-plugins-base0.10-dev and
       libgstreamer0.10-dev build dependencies.
-    - drop libphonon-dev build and qt-mobility build dependencies. GStreamer
-      will be used as the multimedia backend as recommended by upstream.
+    - drop libphonon-dev build and qt-mobility build dependencies.
+      (Closes: #634388) GStreamer will be used as the multimedia backend as
+      recommended by upstream.
   * Update debian/*.install files for multiarch.
   * Add debian/README.source: explain how to create a new upstream tarball.
   * Update debian/rules:

-- 
QtWebKit packaging