[rrd-developers] [PATCH] CBNL: Packaging changes for 10.04 upgrade

[kernel-hacker at bennee.com]

From: Alex Bennee <ajb at cbnl.com>

---
 debian/changelog          |   21 +++++++++++++++++++++
 debian/rrdcached.dirs     |    2 ++
 debian/rrdcached.postinst |    6 ++++--
 debian/rules              |    3 ++-
 4 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 debian/rrdcached.dirs

diff --git a/debian/changelog b/debian/changelog
index 10bad13..387b76e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+rrdtool (1.4.4-cbnl5) unstable; urgency=low
+
+  * Package - actually run dh_installdirs
+
+ -- Alex Bennee <ajb at pitcairn.cambridgebroadband.com>  Fri, 12 Nov 2010 13:28:00 +0100
+
+rrdtool (1.4.4-cbnl4) unstable; urgency=low
+
+  * Package - create /var/lib/rrdcached and /var/lib/rrdcached/journal
+  * patch rrd_daemon.c to not SEG when /var/lib/rrdcached/journal not resolvable
+
+ -- Alex Bennee <ajb at pitcairn.cambridgebroadband.com>  Fri, 12 Nov 2010 13:01:00 +0100
+
+rrdtool (1.4.4-cbnl3) unstable; urgency=low
+
+  * Package build tweaks
+    - move upstart config files to 10.04
+    - test for socket existence before testing group
+
+ -- Alex Bennee <ajb at pitcairn.cambridgebroadband.com>  Fri, 12 Nov 2010 11:20:11 +0100
+
 rrdtool (1.4.4-cbnl2) unstable; urgency=low
 
   * Package build tweaks
diff --git a/debian/rrdcached.dirs b/debian/rrdcached.dirs
new file mode 100644
index 0000000..734f20b
--- /dev/null
+++ b/debian/rrdcached.dirs
@@ -0,0 +1,2 @@
+var/lib/rrdcached
+var/lib/rrdcached/journal
diff --git a/debian/rrdcached.postinst b/debian/rrdcached.postinst
index 7f70b10..8f54e5d 100644
--- a/debian/rrdcached.postinst
+++ b/debian/rrdcached.postinst
@@ -22,8 +22,10 @@ configure_rrdcached() {
         echo "..done"
     fi
     # Ensure we restart if the socket isn't owned by $RRD_SOCKET_GROUP
-    if ! ls -l /var/run/rrdcached.sock | grep -q "$RRD_SOCKET_GROUP" ; then
-        initctl --quiet stop rrdcached
+    if [ -S /var/run/rrdcached.sock ]; then
+	if ! ls -l /var/run/rrdcached.sock | grep -q "$RRD_SOCKET_GROUP" ; then
+            initctl --quiet stop rrdcached
+	fi
     fi
     initctl --quiet start rrdcached
 }
diff --git a/debian/rules b/debian/rules
index 9847e39..cd28f09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -149,6 +149,7 @@ install-common-stamp: build-arch-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
+	dh_installdirs
 
 	make install DESTDIR=$(CURDIR)/debian/tmp
 	# we don't want .txt and .pod documentation in the package
@@ -218,7 +219,7 @@ binary-arch: build-arch install-arch
 	dh_pysupport -prrdtool-dbg
 	dh_perl -a
 	dh_installman -a
-	install -m 644 -o root -g root -D debian/rrdcached.upstart debian/rrdcached/etc/event.d/rrdcached || exit 1;
+	install -m 644 -o root -g root -D debian/rrdcached.upstart debian/rrdcached/etc/init/rrdcached.conf || exit 1;
 	install -m 644 -o root -g root -D debian/rrdcached.default debian/rrdcached/etc/default/rrdcached || exit 1;
 	dh_link -a
 	dh_strip -a --dbg-package=rrdtool-dbg
-- 
1.7.3.2