[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.6.2-5-15-gda39893

[Fathi Boudra]

The following commit has been merged in the experimental-snapshots branch:
commit 1ebe425702198878feb33cb9ada0da2702211488
Author: Fathi Boudra <fabo at debian.org>
Date:   Mon May 24 15:34:45 2010 +0300

    Merge libqt4-mediaservices with libqt4-multimedia package.
---
 debian/changelog                    |    2 +-
 debian/control                      |   13 ++-----------
 debian/libqt4-mediaservices.install |    1 -
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6993956..572f4e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ qt4-x11 (4:4.7.0~beta1-1) UNRELEASED; urgency=low
     - QtAssistant client library removal (libqt4-assistant).
     - legacy Qt Assistant removal (assistant_adp).
     - new QtDeclarative module (libqt4-declarative).
-    - new QtMediaServices module (libqt4-mediaservices).
+    - new QtMediaServices module (libqt4-multimedia).
   * Remove upstream patches:
     - 0001_qpixmap_load_no_modify_referenced_copies.diff - stolen upstream
     - 0002_qmake_qfileinfo_absolutepath.diff - stolen upstream
diff --git a/debian/control b/debian/control
index 0059966..341ab2a 100644
--- a/debian/control
+++ b/debian/control
@@ -317,15 +317,6 @@ Description: Qt 4 Multimedia module
  .
  The Qt Multimedia module provides low-level multimedia functionality.
 
-Package: libqt4-mediaservices
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Qt 4 MediaServices module
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- The Qt MediServices module provides ??? (NOT DOCUMENTED).
-
 Package: libqt4-phonon
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -363,8 +354,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (= ${binary:Version}),
  libqt4-scripttools (= ${binary:Version}), libqt4-xmlpatterns (= ${binary:Version}),
  libqt4-qt3support (= ${binary:Version}), libqt4-designer (= ${binary:Version}),
  libqt4-help (= ${binary:Version}), libqt4-test (= ${binary:Version}),
- libqt4-multimedia (= ${binary:Version}), libqt4-mediaservices (= ${binary:Version}),
- libqt4-declarative (= ${binary:Version}), qt4-qmake (= ${binary:Version})
+ libqt4-multimedia (= ${binary:Version}), libqt4-declarative (= ${binary:Version}),
+ qt4-qmake (= ${binary:Version})
 Recommends: libqt4-opengl-dev (= ${binary:Version})
 Conflicts: qt3-dev-tools (<= 3:3.3.4-7), libqtwebkit-dev
 Replaces: libqtwebkit-dev, libqt4-opengl-dev (<< 4.4.0-2)
diff --git a/debian/libqt4-mediaservices.install b/debian/libqt4-mediaservices.install
deleted file mode 100644
index 25ed293..0000000
--- a/debian/libqt4-mediaservices.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libQtMediaServices.so.*

-- 
Qt 4 Debian packaging