rev 11001 - branches/kde4/packages/phonon/debian

[Pino Toscano]

Author: pino-guest
Date: 2008-06-13 15:08:51 +0000 (Fri, 13 Jun 2008)
New Revision: 11001

Modified:
   branches/kde4/packages/phonon/debian/changelog
   branches/kde4/packages/phonon/debian/control
   branches/kde4/packages/phonon/debian/rules
Log:
some refactoring of the dependencies, as agreed with modestas and sune:
+ make the phonon-backend-gstreamer provide a virtual phonon-backend
+ create a phonon metapackage that installs the phonon library and ensure a backend is installed too


Modified: branches/kde4/packages/phonon/debian/changelog
===================================================================
--- branches/kde4/packages/phonon/debian/changelog	2008-06-13 14:26:44 UTC (rev 11000)
+++ branches/kde4/packages/phonon/debian/changelog	2008-06-13 15:08:51 UTC (rev 11001)
@@ -1,3 +1,15 @@
+phonon (4:4.2~svn820171-2) UNRELEASED; urgency=low
+
+  +++ Changes by Pino Toscano:
+
+  * Make the phonon-backend-gstreamer provide a virtual phonon-backend.
+  * Create a phonon metapackage that installs the phonon library and ensure
+    a backend is installed too.
+  * All the changes above were agreed with Modestas Vainius and Sune Vuorela,
+    thanks.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 13 Jun 2008 17:03:52 +0200
+
 phonon (4:4.2~svn820171-1) experimental; urgency=low
 
   +++ Changes by Ana Guerrero and Modestas Vainius:

Modified: branches/kde4/packages/phonon/debian/control
===================================================================
--- branches/kde4/packages/phonon/debian/control	2008-06-13 14:26:44 UTC (rev 11000)
+++ branches/kde4/packages/phonon/debian/control	2008-06-13 15:08:51 UTC (rev 11001)
@@ -11,6 +11,16 @@
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/phonon
 Vcs-Svn: svn://svn.debian.org/pkg-kde/branches/kde4/packages/phonon
 
+Package: phonon
+Section: libs
+Architecture: all
+Depends: phonon-backend-gstreamer | phonon-backend, libphonon4 (>= ${source:Version})
+Suggests: phonon-backend-xine, phonon-backend-vlc, phonon-backend-mplayer
+Description: meta package for Phonon multimedia framework
+ Phonon is the Qt4 multimedia API, which provides a task-oriented abstraction
+ layer for capturing, mixing, processing, and playing audio and video content.
+ .
+ This metapackage ensures a working Phonon (libphonon4 and a backend).
 
 Package: libphonon-dev
 Section: libdevel
@@ -27,7 +37,7 @@
 Package: libphonon4
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, phonon-backend-gstreamer (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: kdelibs5 (<= 4:4.0.80)
 Description: Phonon multimedia framework for Qt 4
  Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
@@ -38,8 +48,8 @@
 Package: phonon-backend-gstreamer
 Section: sound
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: libphonon4
+Depends: ${shlibs:Depends}, ${misc:Depends}, libphonon4 (= ${binary:Version})
+Provides: phonon-backend
 Description: Phonon GStreamer 0.10.x backend
  Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
  layer for capturing, mixing, processing, and playing audio and video content.

Modified: branches/kde4/packages/phonon/debian/rules
===================================================================
--- branches/kde4/packages/phonon/debian/rules	2008-06-13 14:26:44 UTC (rev 11000)
+++ branches/kde4/packages/phonon/debian/rules	2008-06-13 15:08:51 UTC (rev 11001)
@@ -2,8 +2,6 @@
 
 include debian/cdbs/kde.mk
 
-DEB_DH_MAKESHLIBS_ARGS_libphonon4 = -V'libphonon4 (>> 4:4.2~)'
+PHONON_MINIMUM_VERSION := 4:4.2~
 
-# No circular dependancy with libphonon
-DEB_DH_SHLIBDEPS_ARGS_phonon-backend-gstreamer = -- -xlibphonon4
-
+DEB_DH_MAKESHLIBS_ARGS_libphonon4 = -V'libphonon4 (>> $(PHONON_MINIMUM_VERSION)), phonon(>> $(PHONON_MINIMUM_VERSION))'