[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.6.0really4.5.1-1-3-gfdd70f7

[Sune Vuorela]

The following commit has been merged in the master branch:
commit fdd70f7c2c27065b710bd79492e914c20265beb2
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Sun Jan 22 22:53:17 2012 +0100

    Make phonon conflicts with the xine backend. People must migrate away
---
 debian/changelog |    5 ++++-
 debian/control   |    3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f056c98..2b50a93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,10 @@ phonon (4:4.6.0really4.5.1-2) UNRELEASED; urgency=low
   [ Debconf translation updates ]
   * Italian (Francesca Ciceri). (Closes: #656468)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 19 Jan 2012 16:19:02 +0100
+  [ Sune Vuorela ]
+  * Make phonon conflicts with the xine backend. People must migrate away
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 22 Jan 2012 22:51:45 +0100
 
 phonon (4:4.6.0really4.5.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index dba96bf..d598f0b 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,8 @@ Architecture: all
 Depends: ${misc:Depends}, libphonon4 (>= ${source:Version}),
  ${phonon:Recommended-Backend} | phonon-backend
 Suggests: ${phonon:Recommended-Backend}, phonon-backend-gstreamer,
- phonon-backend-xine, phonon-backend-mplayer
+ phonon-backend-mplayer
+Conflicts: phonon-backend-xine
 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.

-- 
Phonon Multimedia Framework packaging