Added new binary package 'rrdcached'.

diff --git a/debian/changelog b/debian/changelog
index 2337d5a4425d0e08da8098282695f4aa209b4282..f9d580d894cd47eea6918f0ac85907fafffbb091 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,8 +25,10 @@ rrdtool (1.4~rc2-1) experimental; urgency=low
     - The file includes a pointer to /usr/share/doc/quilt/README.source.
   * debian/librrd4.symbols:
     - Added symbols introduced in 1.4~rc2.
+  * Added new binary package 'rrdcached' for the newly introduced "data
+    caching daemon".
 
- -- Sebastian Harl <tokkee@debian.org>  Fri, 25 Sep 2009 22:22:05 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Fri, 25 Sep 2009 22:35:04 +0200
 
 rrdtool (1.3.8-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index cfc13c7e5626129b44b0d73569151d572da9af99..a23b09f55fb3bd163cb32bd14c6131107680ef41 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -37,6 +37,16 @@ Description: time-series data storage and display system (programs)
  This package contains command-line programs used to access and manipulate
  RRDs.
 
+Package: rrdcached
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: data caching daemon for RRDtool
+ RRDCacheD is a daemon that receives updates to existing RRD files, accumulates
+ them and, if enough have been received or a defined time has passed, writes
+ the updates to the RRD file. The daemon was written with big setups in mind.
+ Those setups usually run into I/O related problems. RRDCacheD's goal is to
+ alleviate these problems.
+
 Package: rrdtool-dbg
 Architecture: any
 Priority: extra

diff --git a/debian/rrdcached.install b/debian/rrdcached.install
new file mode 100644 (file)
index 0000000..2c0eedd
--- /dev/null
+++ b/debian/rrdcached.install
@@ -0,0 +1,4 @@
+usr/bin/rrdcached
+usr/share/man/man1/rrdcached.1
+usr/share/doc/rrdtool/html/rrdcached.html usr/share/doc/rrdcached/html/
+usr/share/rrdtool/examples/rrdcached/* usr/share/doc/rrdcached/examples/

diff --git a/debian/rrdtool.install b/debian/rrdtool.install
index d3ec6057a514408dfe302861afb3275151b92385..e717d917cacd3b35051bf48f9c6caabc76b47c2e 100644 (file)
--- a/debian/rrdtool.install
+++ b/debian/rrdtool.install
@@ -2,4 +2,5 @@ usr/share/doc/rrdtool
 usr/bin
 usr/lib/rrdtool/ifOctets.tcl usr/share/doc/rrdtool/examples/
 usr/share/man/man1
-usr/share/rrdtool/examples/* usr/share/doc/rrdtool/examples/
+usr/share/rrdtool/examples/*.cgi usr/share/doc/rrdtool/examples/
+usr/share/rrdtool/examples/*.pl usr/share/doc/rrdtool/examples/

diff --git a/debian/rules b/debian/rules
index 7cac8f60b4ade2f57fcdffd3fdb3d8908854795d..08677642a0aa4479f5c4484865b32b48fd45ab0d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -144,6 +144,10 @@ install-common-stamp: build-arch-stamp
        # we don't want .txt and .pod documentation in the package
        rm -rf debian/tmp/usr/share/doc/rrdtool/txt
        dh_install --sourcedir=$(CURDIR)/debian/tmp --fail-missing
+       # remove duplicates
+       rm debian/rrdtool/usr/bin/rrdcached
+       rm debian/rrdtool/usr/share/man/man1/rrdcached.1
+       rm debian/rrdtool/usr/share/doc/rrdtool/html/rrdcached.html
 
        touch $@
 
@@ -160,7 +164,7 @@ install-arch: install-common-stamp $(PY_VERS:%=install-python%)
        done
 
        dh_installexamples -s
-       chmod 644 debian/rrdtool/usr/share/doc/rrdtool/examples/rrdcached/RRDCached.pm
+       chmod 644 debian/rrdcached/usr/share/doc/rrdcached/examples/RRDCached.pm
 
 install-python%: install-common-stamp
        dh_testdir