[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.6.0really4.4.3-1-15-g7df594a

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 564e7f2f3c8ccdcbf20302b0b478d85623f0f0e3
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Feb 20 12:57:03 2011 +0200

    Drop phonon-backend-xine and phonon-backend-gstreamer.
    
    They have been split off to their own source packages upstream. Only
    phonon-backend-null remains here.
---
 debian/changelog                        |    5 +++++
 debian/control                          |   31 -------------------------------
 debian/phonon-backend-gstreamer.install |    2 --
 debian/phonon-backend-xine.install      |    9 ---------
 debian/rules                            |    3 ---
 5 files changed, 5 insertions(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d87dcc4..0c458e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,11 @@ phonon (4:4.6.0really4.4.4-0r1) UNRELEASED; urgency=low
   * Do not install the header experimental/avcaptureinterface.h in
     libphonon-dev, as it experimental.
 
+  [ Modestas Vainius ]
+  * Drop phonon-backend-xine and phonon-backend-gstreamer. They have been
+    split off to their own source packages upstream. Only phonon-backend-null
+    remains here.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 05 Dec 2010 16:01:39 +0100
 
 phonon (4:4.6.0really4.4.3-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 42e0fc7..fb983c0 100644
--- a/debian/control
+++ b/debian/control
@@ -52,35 +52,6 @@ Description: the core library of the Phonon multimedia framework
  This package contains the core library of the Phonon cross-platform multimedia
  framework for Qt 4.  It is required to run applications that use Phonon.
 
-Package: phonon-backend-xine
-Architecture: any
-Provides: phonon-backend
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xine-x:Depends}
-Replaces: kde-icons-oxygen (<< 4:4.1.80)
-Breaks: kde-icons-oxygen (<< 4:4.1.80)
-Description: Phonon Xine 1.1.x backend
- Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
- layer for capturing, mixing, processing, and playing audio and video content.
- .
- This package contains the Xine 1.1.x backend for Phonon.
-
-Package: phonon-backend-gstreamer
-Architecture: any
-Provides: phonon-backend
-Depends: ${shlibs:Depends}, ${misc:Depends},
- gstreamer0.10-plugins-base, gstreamer0.10-alsa [linux-any]
-Recommends: gstreamer0.10-plugins-good
-Suggests: gstreamer0.10-plugins-ugly
-Description: Phonon GStreamer 0.10.x backend
- Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
- layer for capturing, mixing, processing, and playing audio and video content.
- .
- This package contains GStreamer 0.10.x backend for Phonon.
- .
- You should install gstreamer0.10-plugins-good to get support for playing
- popular free multimedia formats and gstreamer0.10-plugins-ugly to get support
- for popular MPEG audio formats like MP3.
-
 Package: phonon-backend-null
 Architecture: all
 Provides: phonon-backend
@@ -101,8 +72,6 @@ Section: debug
 Depends: ${misc:Depends}, libphonon4 (= ${binary:Version})
 Conflicts: phonon-backends-dbg
 Replaces: phonon-backends-dbg
-Suggests: phonon-backend-xine (= ${binary:Version}),
- phonon-backend-gstreamer (= ${binary:Version})
 Description: Phonon debugging symbols
  Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
  layer for capturing, mixing, processing, and playing audio and video content.
diff --git a/debian/phonon-backend-gstreamer.install b/debian/phonon-backend-gstreamer.install
deleted file mode 100644
index a28396a..0000000
--- a/debian/phonon-backend-gstreamer.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/qt4/plugins/phonon_backend/phonon_gstreamer.so
-usr/share/kde4/services/phononbackends/gstreamer.desktop
diff --git a/debian/phonon-backend-xine.install b/debian/phonon-backend-xine.install
deleted file mode 100644
index f15dc9a..0000000
--- a/debian/phonon-backend-xine.install
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/lib/qt4/plugins/phonon_backend/phonon_xine.so
-usr/share/icons/oxygen/128x128/apps/phonon-xine.png
-usr/share/icons/oxygen/16x16/apps/phonon-xine.png
-usr/share/icons/oxygen/22x22/apps/phonon-xine.png
-usr/share/icons/oxygen/32x32/apps/phonon-xine.png
-usr/share/icons/oxygen/48x48/apps/phonon-xine.png
-usr/share/icons/oxygen/64x64/apps/phonon-xine.png
-usr/share/icons/oxygen/scalable/apps/phonon-xine.svgz
-usr/share/kde4/services/phononbackends/xine.desktop
diff --git a/debian/rules b/debian/rules
index 8a6bed0..ecbeee1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,3 @@ DEB_DH_SHLIBDEPS_ARGS_ALL := -- -xphonon
 # Strict interdependencies for backends
 DEB_STRICT_LOCAL_SHLIBS_PACKAGES = $(DEB_LIBRARY_PACKAGES)
 include /usr/share/pkg-kde-tools/qt-kde-team/1/library-packages.mk
-
-binary-predeb/phonon-backend-xine::
-	dh_xine -pphonon-backend-xine

-- 
Phonon Multimedia Framework packaging