[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:09:07 UTC 2011


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

    Use $(DEB_RECOMMENDED_PHONON_BACKEND) wherever possible.
---
 debian/control |    6 +++---
 debian/rules   |    1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 8f21383..e4f064d 100644
--- a/debian/control
+++ b/debian/control
@@ -14,9 +14,9 @@ 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
-Suggests: phonon-backend-vlc, phonon-backend-gstreamer, phonon-backend-xine,
- phonon-backend-mplayer
+ ${phonon:Recommended-Backend} | phonon-backend
+Suggests: ${phonon:Recommended-Backend}, phonon-backend-gstreamer,
+ phonon-backend-xine, phonon-backend-mplayer
 Description: metapackage for the Phonon multimedia framework
  Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
  layer for capturing, mixing, processing, and playing audio and video content.
diff --git a/debian/rules b/debian/rules
index 7a514f7..e2b763f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@ DEB_DH_MAKESHLIBS_ARGS_libphonon4 = -V'libphonon4 (>= $(UPSTREAMVERSION)), phono
 
 DEB_CMAKE_EXTRA_FLAGS += -DPLUGIN_INSTALL_DIR=/usr/lib/qt4/
 DEB_DH_SHLIBDEPS_ARGS_ALL := -- -xphonon
+DEB_DH_GENCONTROL_ARGS_ALL := -- -Vphonon:Recommended-Backend=$(DEB_RECOMMENDED_PHONON_BACKEND)
 
 # Strict interdependencies for backends
 DEB_STRICT_LOCAL_SHLIBS_PACKAGES = $(DEB_LIBRARY_PACKAGES)

-- 
Phonon Multimedia Framework packaging



More information about the pkg-kde-commits mailing list