From: Sebastian Harl Date: Sun, 14 Jun 2009 15:07:32 +0000 (+0200) Subject: Dropped most changes introduced in etch-backports. X-Git-Tag: collectd-4.6.3-1--bpo50+1^0 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f448b6074c42696b5745fa2d396bc8926c646e4e;p=pkg-collectd.git Dropped most changes introduced in etch-backports. Remaining changes: Build-conflict with iptables-dev to force the use of the shipped libiptc. --- diff --git a/debian/changelog b/debian/changelog index d633f9f..6b7e2e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ collectd (4.6.3-1~bpo50+1) lenny-backports; urgency=low * Rebuild for lenny-backports. + * Remaining changes: + - Build-conflict with iptables-dev to force the use of the shipped libiptc + (this allows building the iptables plugin on all architectures). - -- Sebastian Harl Sun, 14 Jun 2009 16:20:23 +0200 + -- Sebastian Harl Sun, 14 Jun 2009 17:06:37 +0200 collectd (4.6.3-1~bpo40+1) etch-backports; urgency=low diff --git a/debian/collectd.conf b/debian/collectd.conf index 2b042a9..31ac1cd 100644 --- a/debian/collectd.conf +++ b/debian/collectd.conf @@ -36,6 +36,7 @@ LoadPlugin cpu #LoadPlugin cpufreq #LoadPlugin csv #LoadPlugin curl +#LoadPlugin dbi LoadPlugin df LoadPlugin disk #LoadPlugin dns @@ -145,6 +146,29 @@ LoadPlugin users # # +# +# +# Statement "SELECT 'customers' AS c_key, COUNT(*) AS c_value \ +# FROM customers_tbl" +# +# Type "gauge" +# InstancesFrom "c_key" +# ValuesFrom "c_value" +# +# +# +# +# Driver "mysql" +# DriverOption "host" "localhost" +# DriverOption "username" "collectd" +# DriverOption "password" "secret" +# DriverOption "dbname" "custdb0" +# #SelectDB "custdb0" +# Query "num_of_customers" +# #Query "..." +# +# + # # Device "/dev/sda1" # Device "192.168.0.2:/mnt/nfs" diff --git a/debian/collectd.overrides b/debian/collectd.overrides index f58958c..669147c 100644 --- a/debian/collectd.overrides +++ b/debian/collectd.overrides @@ -1,4 +1,3 @@ -collectd: shlib-with-non-pic-code usr/lib/collectd/nut.so collectd: shlib-with-non-pic-code usr/lib/collectd/netlink.so collectd: spelling-error-in-description apache Apache collectd: spelling-error-in-description mysql MySQL diff --git a/debian/control b/debian/control index c91ad8a..1a7271b 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: collectd Section: utils Priority: optional Maintainer: Sebastian Harl -Build-Depends: debhelper (>= 5), po-debconf, dpatch, bison, flex, autotools-dev, pkg-config, linux-kernel-headers, libcurl3-gnutls-dev, libmysqlclient15-dev, librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, nut-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel], libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel], libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev, libglib2.0-dev, libnotify-dev, libesmtp-dev, libpq-dev +Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison, flex, autotools-dev, pkg-config, linux-libc-dev (>= 2.6.25-4) | linux-libc-dev (<< 2.6.25-1), libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev, libmysqlclient15-dev, librrd-dev | librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, libupsclient1-dev, libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel], libsnmp-dev | libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev (>= 2.0.14-1~), libglib2.0-dev, libnotify-dev, libesmtp-dev, libpq-dev, libdbi0-dev Build-Conflicts: libpthread-dev, iptables-dev Standards-Version: 3.8.1 Homepage: http://collectd.org/ @@ -44,6 +44,7 @@ Description: statistics collection and monitoring daemon * CPU frequency: cpufreq * output to comma separated values (CSV) files: csv * parse statistics from websites: curl + * query data from a relational database: dbi * disk space usage: df * disk and partition throughput: disk * DNS traffic information: dns diff --git a/debian/rules b/debian/rules index b0ca029..c944ebe 100755 --- a/debian/rules +++ b/debian/rules @@ -46,11 +46,10 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \ # These plugins do not provide any functionality under Linux. confflags += --disable-apple_sensors --disable-tape -# The static libraries netstat and upsclient cannot be linked into shared -# objects on some architectures (see bugs #358637 and #419684 for more -# details). +# The static library netstat cannot be linked into shared objects on some +# architectures (see bugs #358637 and #419684 for more details). ifneq (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 hppa ia64 ppc64 mips mipsel)) - confflags += --disable-netlink --disable-nut + confflags += --disable-netlink endif # libvirt is only available on amd64, i386 and powerpc. @@ -58,19 +57,8 @@ ifeq (,$(findstring $(DEB_BUILD_ARCH),amd64 i386 powerpc)) confflags += --disable-libvirt endif -# libdbi is not available on Etch -confflags += --disable-dbi - config.status: configure $(DPATCH_STAMPFN) dh_testdir - - # This is a work-around for #474087 (broken openipmi .pc files). - mkdir debian/pkgconfig - sed -re 's/^(Requires:.*) pthread(.*)$$/\1\2/' \ - /usr/lib/pkgconfig/OpenIPMIpthread.pc \ - > debian/pkgconfig/OpenIPMIpthread.pc - - PKG_CONFIG_PATH="$(CURDIR)/debian/pkgconfig:$$PKG_CONFIG_PATH" \ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" ./configure $(confflags) build: build-stamp @@ -93,8 +81,6 @@ clean: unpatch rm -f debian/README.Debian.plugins rm -f src/*.1 src/*.5 - rm -rf debian/pkgconfig - dh_clean debconf-updatepo