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

Modestas Vainius modax at alioth.debian.org
Sun Feb 27 00:08:59 UTC 2011


The following commit has been merged in the master branch:
commit 50a54a5a7f8f38531702a169c652bba578998967
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Feb 27 01:36:17 2011 +0200

    Basically revert 1f7b8cfa.
    
    Keep only phonon-backend-null preference if libphonon-dev is installed first.
    This change cause too much breakage (kdebase-runtime and amarok) for
    insignificant benefit. The hack worked only with aptitude anyway.
---
 debian/changelog |   10 +---------
 debian/control   |    4 ++--
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 91e35bd..533988e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,15 +18,7 @@ phonon (4:4.6.0really4.4.4-0r3) UNRELEASED; urgency=low
   * 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), aptitude
-    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.
+    libphonon-dev (which normally won't be a case on user systems).
   * Add lintian override for "phonon-backend-null: empty-binary-package".
   * Reshuffle backends in the Suggests of the phonon metapackage in the order of
     preferrence.
diff --git a/debian/control b/debian/control
index ea35e26..8f21383 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,7 @@ 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-null
-Recommends: phonon-backend-vlc | phonon-backend-gstreamer | phonon-backend
+ phonon-backend-vlc | phonon-backend
 Suggests: phonon-backend-vlc, phonon-backend-gstreamer, phonon-backend-xine,
  phonon-backend-mplayer
 Description: metapackage for the Phonon multimedia framework
@@ -51,6 +50,7 @@ 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



More information about the pkg-kde-commits mailing list