Include collection3 in /usr/share/doc/collectd/examples/.

 * Updated README.Debian to point the collection3's README.
 * Added libconfig-general-perl to the suggested packages.

diff --git a/debian/README.Debian b/debian/README.Debian
index 654b5aa6dce4a9d8cde170acc4231517b1e92177..63086be25941e82dc34a41288b8a237810eca7cd 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -41,6 +41,10 @@ solutions are welcome.
   is installed to /etc/collectd/collection.conf. You should not need to change
   anything there.
 
+- collection3: A graphing front-end for the RRD files created by and filled
+  with collectd. See /usr/share/doc/collectd/examples/collection3/README for
+  details. This is a successor for collection.cgi.
+
 Building your own plugins:
 --------------------------
 
@@ -56,7 +60,7 @@ Building your own plugins:
   collectd-dev package and use /usr/share/doc/collectd-dev/examples/myplugin.c
   as a starting point (Note: This is already a working example, though it does
   not collect any useful data).
-  
+
   The resulting file can be compiled as follows:
 
     gcc -shared -fPIC -o myplugin.so myplugin.c

diff --git a/debian/changelog b/debian/changelog
index f6243d8de59cc769494d8a09ef6fc47d2fe0c4e6..d5056321fb010574e5150b6eaa1a3875d2942a25 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,11 @@ collectd (4.4.2-1) unstable; urgency=low
   * Removed byacc from the build-dependencies - collectd now requires bison.
   * Removed libupsclient-config.sh - upstream now supports pkg-config for
     libupsclient.
+  * Include collection3 in /usr/share/doc/collectd/examples/:
+    - Updated README.Debian to point the collection3's README.
+    - Added libconfig-general-perl to the suggested packages.
 
- -- Sebastian Harl <sh@tokkee.org>  Fri, 25 Jul 2008 13:28:33 +0200
+ -- Sebastian Harl <sh@tokkee.org>  Fri, 25 Jul 2008 15:27:56 +0200
 
 collectd (4.4.1-2) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 5a6c774e0858ac5471105a1bcb7ce3da95153964..bbb843c6274a97fdc26afd62928406b0d1535e5a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: perl, rrdtool, lm-sensors, ${shlibs:Recommends}
 Suggests: collectd-dev, librrds-perl, liburi-perl, libhtml-parser-perl,
- libregexp-common-perl, httpd-cgi, hddtemp, mbmon
+ libregexp-common-perl, libconfig-general-perl, httpd-cgi, hddtemp, mbmon
 Conflicts: collectd-apache, collectd-dns, collectd-hddtemp, collectd-mysql,
  collectd-perl, collectd-ping, collectd-sensors
 Provides: collectd-apache, collectd-dns, collectd-hddtemp, collectd-mysql,

diff --git a/debian/rules b/debian/rules
index 86ac6c55fb7153081e86ee2d0293d6f84e21f683..98a6acba59ecc84a5ef1b497b5fac62bb0022bce 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -145,6 +145,7 @@ binary-arch: build install-arch
        dh_installdocs -A -a debian/README.Debian AUTHORS README TODO
        dh_installdocs -a debian/NEWS.Debian debian/README.Debian.plugins
        dh_installexamples -a contrib/collectd2html.pl contrib/collection.cgi \
+               contrib/collection3/ \
                contrib/exec-munin.conf contrib/exec-munin.px contrib/exec-smartctl \
                contrib/exec-nagios.conf contrib/exec-nagios.px \
                contrib/SpamAssassin/ contrib/iptables/ contrib/cussh.pl \