rev 16815 - trunk/packages/kdebase-runtime/debian

[George Kiagiadakis]

Author: gkiagia-guest
Date: 2010-02-06 21:59:43 +0000 (Sat, 06 Feb 2010)
New Revision: 16815

Added:
   trunk/packages/kdebase-runtime/debian/kde-config-phonon-xine.install
Modified:
   trunk/packages/kdebase-runtime/debian/changelog
   trunk/packages/kdebase-runtime/debian/control
   trunk/packages/kdebase-runtime/debian/kdebase-runtime-data.install
   trunk/packages/kdebase-runtime/debian/kdebase-runtime.install
Log:
Merge the patch from bug #559748, with a slight modification on the new package name (s/kcm/kde-config/),
to reflect the recent discussion about kcm package names on pkg-kde-talk.


Modified: trunk/packages/kdebase-runtime/debian/changelog
===================================================================
--- trunk/packages/kdebase-runtime/debian/changelog	2010-02-06 21:43:53 UTC (rev 16814)
+++ trunk/packages/kdebase-runtime/debian/changelog	2010-02-06 21:59:43 UTC (rev 16815)
@@ -19,6 +19,11 @@
   * Add build-dependencies to libattica-dev, libssh-dev, libexiv2-dev.
   * Drop libknotificationitem-1-dev build-dependency.
 
+  [ Jonathan Thomas ]
+  * Split the KCM for the Phonon Xine backend into a separate package from the
+    kdebase-runtime binary package to prevent all of KDE from depending on Xine.
+    (Closes: #559748)
+
  -- George Kiagiadakis <gkiagiad at csd.uoc.gr>  Sat, 06 Feb 2010 17:03:53 +0200
 
 kdebase-runtime (4:4.3.4-2) unstable; urgency=low

Modified: trunk/packages/kdebase-runtime/debian/control
===================================================================
--- trunk/packages/kdebase-runtime/debian/control	2010-02-06 21:43:53 UTC (rev 16814)
+++ trunk/packages/kdebase-runtime/debian/control	2010-02-06 21:59:43 UTC (rev 16815)
@@ -67,6 +67,17 @@
  .
  This package is part of the KDE 4 base runtime module.
 
+Package: kde-config-phonon-xine
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kdebase-runtime-data (<< 4:4.4.0), kdebase-runtime (<< 4:4.4.0)
+Description: advanced Phonon Xine configuration
+ This package contains a configuration module for tweaking some of the more
+ advanced settings for Phonon's Xine backend.
+ .
+ This package is part of the KDE 4 base runtime module.
+
 Package: plasma-scriptengine-javascript
 Section: kde
 Architecture: any

Added: trunk/packages/kdebase-runtime/debian/kde-config-phonon-xine.install
===================================================================
--- trunk/packages/kdebase-runtime/debian/kde-config-phonon-xine.install	                        (rev 0)
+++ trunk/packages/kdebase-runtime/debian/kde-config-phonon-xine.install	2010-02-06 21:59:43 UTC (rev 16815)
@@ -0,0 +1,2 @@
+usr/lib/kde4/kcm_phononxine.so
+usr/share/kde4/services/kcm_phononxine.desktop

Modified: trunk/packages/kdebase-runtime/debian/kdebase-runtime-data.install
===================================================================
--- trunk/packages/kdebase-runtime/debian/kdebase-runtime-data.install	2010-02-06 21:43:53 UTC (rev 16814)
+++ trunk/packages/kdebase-runtime/debian/kdebase-runtime-data.install	2010-02-06 21:59:43 UTC (rev 16815)
@@ -457,7 +457,6 @@
 usr/share/kde4/services/kcm_kdnssd.desktop
 usr/share/kde4/services/kcm_nepomuk.desktop
 usr/share/kde4/services/kcm_phonon.desktop
-usr/share/kde4/services/kcm_phononxine.desktop
 usr/share/kde4/services/kcmcgi.desktop
 usr/share/kde4/services/kcmkded.desktop
 usr/share/kde4/services/kcmnotify.desktop

Modified: trunk/packages/kdebase-runtime/debian/kdebase-runtime.install
===================================================================
--- trunk/packages/kdebase-runtime/debian/kdebase-runtime.install	2010-02-06 21:43:53 UTC (rev 16814)
+++ trunk/packages/kdebase-runtime/debian/kdebase-runtime.install	2010-02-06 21:59:43 UTC (rev 16815)
@@ -46,7 +46,6 @@
 usr/lib/kde4/kcm_locale.so
 usr/lib/kde4/kcm_nepomuk.so
 usr/lib/kde4/kcm_phonon.so
-usr/lib/kde4/kcm_phononxine.so
 usr/lib/kde4/kcm_trash.so
 usr/lib/kde4/kcmspellchecking.so
 usr/lib/kde4/kded_desktopnotifier.so