Disabled xmms plugin.

xmms will be removed from unstable.

diff --git a/debian/changelog b/debian/changelog
index 387fd3d9201c43c9dd718408739a5c4ebb0ca2e3..81bb2517db7705375a04bb8b2ad6da80f9a0bd45 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,10 @@ collectd (4.2.4-1) experimental; urgency=low
   * Updated standards-version to 3.7.3 (no changes).
   * Added --without-libstatgrab to the configure options to prevent collectd
     from being linked against this library if it's available.
+  * Disabled xmms plugin - xmms will be removed from unstable
+    (Closes: #459707).
 
- -- Sebastian Harl <sh@tokkee.org>  Sun, 27 Jan 2008 17:59:59 +0100
+ -- Sebastian Harl <sh@tokkee.org>  Sun, 27 Jan 2008 18:34:23 +0100
 
 collectd (4.2.1-1) experimental; urgency=low
 

diff --git a/debian/collectd.conf b/debian/collectd.conf
index a8aa99318fcb1c0d674bac1f282a488b9c7b437b..0b57f3b7b11a77a714b25a79a7a10e6468660310 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -57,7 +57,6 @@ LoadPlugin tcpconns
 LoadPlugin users
 #LoadPlugin vserver
 #LoadPlugin wireless
-#LoadPlugin xmms
 
 #<Plugin apache>
 #   URL "http://localhost/status?auto"

diff --git a/debian/control b/debian/control
index a4ec4b9350312301b895c7bf5023ae468f16f677..f004bd39caec795acd484f8c8e9a6dbefb488fc7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: collectd
 Section: utils
 Priority: optional
 Maintainer: Sebastian Harl <sh@tokkee.org>
-Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison | byacc, flex, autotools-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, iptables-dev [!alpha !amd64 !hppa !ia64 !ppc64], nut-dev [!alpha !amd64 !hppa !ia64 !ppc64], libperl-dev, iproute-dev, libsnmp-dev | libsnmp9-dev, xmms-dev
+Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison | byacc, flex, autotools-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, iptables-dev [!alpha !amd64 !hppa !ia64 !ppc64], nut-dev [!alpha !amd64 !hppa !ia64 !ppc64], libperl-dev, iproute-dev, libsnmp-dev | libsnmp9-dev
 Build-Conflicts: libpthread-dev
 Standards-Version: 3.7.3
 Homepage: http://collectd.org/
@@ -74,7 +74,6 @@ Description: statistics collection daemon
    * number of users logged into the system: users
    * system resources used by Linux-VServers: vserver
    * wireless network stats: wireless
-   * bitrate and frequency of music played with XMMS: xmms
 
 Package: collectd-dbg
 Section: utils

diff --git a/debian/rules b/debian/rules
index 2f81bad94dabadd045ae581097a3e40d7a8c8409..8238a90440df54e9e9b1f69e68df0dcde996f007 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,7 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \
                        --mandir=\$${prefix}/share/man \
                        --localstatedir=/var --sysconfdir=/etc \
                        --with-perl-bindings="INSTALLDIRS=vendor" \
+                       --disable-xmms \
                        --without-libstatgrab \
                        --enable-debug