[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.6.0.0-2-2-gfdfb3da

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/phonon.git;a=commitdiff;h=fdfb3da

The following commit has been merged in the master branch:
commit fdfb3da4c7a78d03c5a0f35b36f52ad3b24deaa9
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Jan 26 11:55:41 2013 -0300

    Add a phonon-backend-xine transitional package.
    
    Thanks Andreas Beckmann for the patch.
---
 debian/changelog |    5 ++++-
 debian/control   |    9 ++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 462b2e7..de66731 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 phonon (4:4.6.0.0-3) UNRELEASED; urgency=low
 
-
+  * Add phonon-backend-xine transitional package, transition to the vlc
+    backend. This fixes the "Could not perform immediate configuration on
+    'phonon-backend-vlc'" apt error on upgrades from squeeze (Closes: #669278).
+    Thanks Andreas Beckmann for the patch to fix this issue.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 26 Jan 2013 11:50:22 -0300
 
diff --git a/debian/control b/debian/control
index 326bacf..559fa1d 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Depends: libphonon4 (>= ${source:Version}),
 Suggests: phonon-backend-gstreamer,
           phonon-backend-mplayer,
           ${phonon:Recommended-Backend}
-Conflicts: phonon-backend-xine
+Breaks: phonon-backend-xine (<< 4:4.6.0.0)
 Description: multimedia framework from KDE - metapackage
  Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
  layer for capturing, mixing, processing, and playing audio and video content.
@@ -126,3 +126,10 @@ Description: multimedia framework from KDE - debugging symbols
  This package contains debugging symbols for the Phonon library and its main
  back-ends. Install it if you want to report a crash or debug a problem with
  Phonon or its back-ends.
+
+Package: phonon-backend-xine
+Architecture: all
+Depends: phonon-backend-vlc
+Description: transitional package to aid switching to phonon-backend-vlc
+ This is a transitional dummy package to aid switching to phonon-backend-vlc.
+ It can be safely removed.

-- 
Phonon Multimedia Framework packaging