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

Modestas Vainius modax at alioth.debian.org
Sat Mar 5 00:47:00 UTC 2011


The following commit has been merged in the master branch:
commit d91d178c60bd6a0c49b61cdfaebfbc4d493d7776
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Mar 5 01:53:01 2011 +0200

    phonon-dbg: replace "Conflicts: phonon-backends-dbg" with Breaks.
---
 debian/changelog |    1 +
 debian/control   |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 714bfe9..1cef12b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ phonon (4:4.6.0really4.4.4-0r5) UNRELEASED; urgency=low
     packages include disclaimers (in the README.Debian) about expected usage of
     this library.
   * Add libphononexperimental4 to phonon-dbg Suggests.
+  * phonon-dbg: replace "Conflicts: phonon-backends-dbg" with Breaks.
 
  -- 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 293d3fb..682f9ec 100644
--- a/debian/control
+++ b/debian/control
@@ -98,8 +98,8 @@ Architecture: any
 Section: debug
 Depends: ${misc:Depends}, libphonon4 (= ${binary:Version})
 Suggests: libphononexperimental4 (= ${binary:Version})
-Conflicts: phonon-backends-dbg
 Replaces: phonon-backends-dbg
+Breaks: phonon-backends-dbg
 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.

-- 
Phonon Multimedia Framework packaging



More information about the pkg-kde-commits mailing list