[pkg-kde-commits] rev 2890 - trunk/packages/kdeaddons/debian

[Christopher Martin]

Author: chrsmrtn
Date: 2006-01-15 16:49:02 +0000 (Sun, 15 Jan 2006)
New Revision: 2890

Modified:
   trunk/packages/kdeaddons/debian/changelog
   trunk/packages/kdeaddons/debian/control
   trunk/packages/kdeaddons/debian/rules
Log:
kicker-applets and xmms: the continuing saga.


Modified: trunk/packages/kdeaddons/debian/changelog
===================================================================
--- trunk/packages/kdeaddons/debian/changelog	2006-01-15 16:35:15 UTC (rev 2889)
+++ trunk/packages/kdeaddons/debian/changelog	2006-01-15 16:49:02 UTC (rev 2890)
@@ -1,6 +1,16 @@
+kdeaddons (4:3.5.0-4) UNRELEASED; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * The media control applet still doesn't work for some users without XMMS
+    installed, so disable XMMS support for the applet and point users to
+    xmms-kde instead.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
+
 kdeaddons (4:3.5.0-3) unstable; urgency=low
 
-  * Upload to unstable
+  * Upload to unstable.
 
   * KDE_3_5_BRANCH update (up to r495863).
 

Modified: trunk/packages/kdeaddons/debian/control
===================================================================
--- trunk/packages/kdeaddons/debian/control	2006-01-15 16:35:15 UTC (rev 2889)
+++ trunk/packages/kdeaddons/debian/control	2006-01-15 16:49:02 UTC (rev 2890)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <dato at net.com.org.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
-Build-Depends: cdbs (>= 0.4.27), debhelper (>= 5.0), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.0), atlantik-dev (>= 4:3.5.0), kdebase-dev (>= 4:3.5.0), kdemultimedia-dev (>= 4:3.5.0), libkdegames-dev (>= 4:3.5.0), libkonq4-dev (>= 4:3.5.0), kdepim-dev (>= 4:3.5.0), libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, xmms-dev, libdb4.3++-dev
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 5.0), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.0), atlantik-dev (>= 4:3.5.0), kdebase-dev (>= 4:3.5.0), kdemultimedia-dev (>= 4:3.5.0), libkdegames-dev (>= 4:3.5.0), libkonq4-dev (>= 4:3.5.0), kdepim-dev (>= 4:3.5.0), libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.3++-dev
 Standards-Version: 3.6.2
 
 Package: kdeaddons
@@ -116,8 +116,7 @@
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, kicker
-Recommends: xmms
-Suggests: khelpcenter, kdeaddons-doc-html
+Suggests: xmms-kde, khelpcenter, kdeaddons-doc-html
 Conflicts: ktimemon (<< 4:2.2-alpha1-0)
 Replaces: ktimemon (<< 4:2.2-alpha1-0)
 Provides: ktimemon
@@ -129,6 +128,10 @@
  Included are a system monitor, a colour picker, a media player controller,
  a mathematical evaluator and a binary clock.
  .
+ The media control applet does not support XMMS, as this would force all
+ kicker-applets users to install XMMS. If you want a kicker applet that
+ controls XMMS, install the xmms-kde package.
+ .
  This package is part of KDE, as a component of the KDE addons module.
  See the 'kde' and 'kdeaddons' packages for more information.
 

Modified: trunk/packages/kdeaddons/debian/rules
===================================================================
--- trunk/packages/kdeaddons/debian/rules	2006-01-15 16:35:15 UTC (rev 2889)
+++ trunk/packages/kdeaddons/debian/rules	2006-01-15 16:49:02 UTC (rev 2890)
@@ -5,12 +5,12 @@
 include debian/cdbs/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
+DEB_CONFIGURE_EXTRA_FLAGS := --without-xmms
+
 DEB_DH_STRIP_ARGS := --dbg-package=kdeaddons-dbg
 
 DOC_HTML_PRUNE := konq-plugins/smbmounter
 
-DEB_DH_SHLIBDEPS_ARGS := -Xmediacontrol_panelapplet
-
 binary-install/konq-plugins::
 	mv -f debian/konq-plugins/usr/share/man/py/man1/exif.1 \
 		debian/konq-plugins/usr/share/man/man1/exif.py.1; \