[SCM] Phonon Multimedia Framework packaging branch, experimental, updated. debian/4.7.2-1-14-g67686c4

[Diane Trout]

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

The following commit has been merged in the experimental branch:
commit 878d29e44b6771675645a20d39e068d73f3d5448
Author: Diane Trout <diane at ghic.org>
Date:   Wed Sep 10 15:36:16 2014 -0700

    phonon4qt5-backend-null should only conflict with other phonon4qt5-backends.
---
 debian/changelog | 2 ++
 debian/control   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0277767..4224df6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ phonon (4:4.8.0-1) UNRELEASED; urgency=medium
   * update SO versions to 4.8.0 for libphonon4qt5*.install
   * Add myself to upoaders.
   * Update libphonon4.symbols
+  * phonon4qt5-backend-null should only conflict with other
+    phonon4qt5-backends.
 
  -- Diane Trout <diane at ghic.org>  Tue, 09 Sep 2014 10:55:34 -0700
 
diff --git a/debian/control b/debian/control
index 8e9fb31..3570441 100644
--- a/debian/control
+++ b/debian/control
@@ -190,9 +190,9 @@ Description: multimedia framework from KDE - null back-end (no real back-end)
 Package: phonon4qt5-backend-null
 Architecture: any
 Multi-Arch: same
-Provides: phonon-backend
+Provides: phonon4qt5-backend
 Depends: libphonon4qt5, ${misc:Depends}
-Conflicts: phonon-backend
+Conflicts: phonon4qt5-backend
 Description: multimedia framework from KDE using Qt 5 - null back-end (no real back-end)
  Phonon is a Qt 5 multimedia API, which provides a task-oriented abstraction
  layer for capturing, mixing, processing, and playing audio and video content.

-- 
Phonon Multimedia Framework packaging