[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 1f7b8cfaacc87457c0bf46cee6888b3b89c09270
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Feb 20 16:08:41 2011 +0200

    Try to solve an issue with Phonon backends getting auto-installed on buildds.
    
    phonon-backend-null will be preferred if Phonon is installed via libphonon-dev
    (which normally won't be a case on user systems). However, if auto-recommends
    is switched ON (default on user systems), apt(itude) will prefer to remove
    -null once phonon metapackage is about to be installed due to it recommending
    only real backends. Changes:
    
    - phonon-backend-null no longer provides phonon-backend;
    - add "phonon-backend-null" as an alternative to phonon-backend in
    phonon Depends;
    - add "phonon-backend-null | phonon" to libphonon-dev Depends;
    - add real Phonon backends to phonon metapackage Recommends.
---
 debian/changelog |   11 +++++++++++
 debian/control   |    6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6895265..1215674 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,17 @@ phonon (4:4.6.0really4.4.4-0r1) UNRELEASED; urgency=low
   * Remove sequence number from debian patches filenames.
   * Update install files.
   * Switch default backend to phonon-backend-vlc (phonon metapackage).
+  * Try to solve an issue with Phonon backends getting auto-installed on
+    buildds. phonon-backend-null will be preferred if Phonon is installed via
+    libphonon-dev (which normally won't be a case on user systems). However,
+    if auto-recommends is switched ON (default on user systems), apt(itude)
+    will prefer to remove -null once phonon metapackage is about to be
+    installed due to it recommending only real backends. Changes:
+    - phonon-backend-null no longer provides phonon-backend;
+    - add "phonon-backend-null" as an alternative to phonon-backend in
+      phonon Depends;
+    - add "phonon-backend-null | phonon" to libphonon-dev Depends;
+    - add real Phonon backends to phonon metapackage Recommends.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 05 Dec 2010 16:01:39 +0100
 
diff --git a/debian/control b/debian/control
index 01700de..0d2e097 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,8 @@ Vcs-Git: git://git.debian.org/pkg-kde/kde-req/phonon.git
 Package: phonon
 Architecture: all
 Depends: ${misc:Depends}, libphonon4 (>= ${source:Version}),
- phonon-backend-vlc | phonon-backend
+ phonon-backend-vlc | phonon-backend | phonon-backend-null
+Recommends: phonon-backend-vlc | phonon-backend-gstreamer | phonon-backend
 Suggests: phonon-backend-xine, phonon-backend-gstreamer, phonon-backend-vlc,
  phonon-backend-mplayer
 Description: metapackage for the Phonon multimedia framework
@@ -28,7 +29,7 @@ Package: libphonon-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libphonon4 (= ${binary:Version}),
- ${sameVersionDep:libqt4-dev:libphonon4}
+ ${sameVersionDep:libqt4-dev:libphonon4}, phonon-backend-null | phonon
 Description: development files for the Phonon multimedia framework
  Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
  layer for capturing, mixing, processing, and playing audio and video content.
@@ -50,7 +51,6 @@ Description: the core library of the Phonon multimedia framework
 
 Package: phonon-backend-null
 Architecture: all
-Provides: phonon-backend
 Depends: libphonon4, ${misc:Depends}
 Conflicts: phonon-backend
 Description: Phonon null backend (no real backend)

-- 
Phonon Multimedia Framework packaging