Diff for NMU version 1.4.7-1.2.

diff --git a/debian/changelog b/debian/changelog
index 4d1e443aa6542f597dfdf1284913e19f95078cea..8dfd223aecaec904b12c472bdbda4b0c73ccfd7a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+rrdtool (1.4.7-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "fails to install, postinst, invoke-rc.d rrdcached start, start-
+    stop-daemon, segfault":
+    (re-)create /var/lib/rrdcached/{journal,db} in init script.
+    (Closes: #664724)
+  * debian/rules: remove the generated bindings/perl-shared/MYMETA.yml in the
+    clean target.
+
+ -- gregor herrmann <gregoa@debian.org>  Sun, 29 Jul 2012 17:35:13 +0200
+

 rrdtool (1.4.7-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
 rrdtool (1.4.7-1.1) unstable; urgency=low
 
   * Non-maintainer upload.

diff --git a/debian/rrdcached.init.d b/debian/rrdcached.init.d
index 66aadcbeff455bdd0fe47adbe9db06b0441c1932..296c4cc78f6d4628f663c97f663741c03a9bcd41 100755 (executable)
--- a/debian/rrdcached.init.d
+++ b/debian/rrdcached.init.d
@@ -61,6 +61,10 @@ d_start() {
                return 0
        fi
 
                return 0
        fi
 

+       # make sure we have the needed directories
+       mkdir -p /var/lib/rrdcached/journal/
+       mkdir -p /var/lib/rrdcached/db/
+

        start-stop-daemon --start --quiet --oknodo --pidfile "$PIDFILE" \
                --exec $DAEMON -- $OPTS -p "$PIDFILE"
 }
        start-stop-daemon --start --quiet --oknodo --pidfile "$PIDFILE" \
                --exec $DAEMON -- $OPTS -p "$PIDFILE"
 }

diff --git a/debian/rules b/debian/rules
index f9b33eb99df2cc0ce5b30be226a6ff111435957a..040c37240496395af9ec933b699a1e49a991536c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -123,7 +123,7 @@ endif
 
        # clean what the Makefiles do not clean ...
        rm -rf bindings/perl-piped/blib bindings/perl-shared/blib \
 
        # clean what the Makefiles do not clean ...
        rm -rf bindings/perl-piped/blib bindings/perl-shared/blib \

-              bindings/perl-piped/Makefile.old bindings/perl-shared/Makefile.old
+              bindings/perl-piped/Makefile.old bindings/perl-shared/Makefile.old bindings/perl-shared/MYMETA.yml

        rm -f bindings/tcl/pkgIndex.tcl bindings/tcl/tclrrd*.so
        rm -f examples/cgi-demo.cgi
        rm -rf src/.libs src/.deps doc/*.html doc/*.1 doc/*.txt
        rm -f bindings/tcl/pkgIndex.tcl bindings/tcl/tclrrd*.so
        rm -f examples/cgi-demo.cgi
        rm -rf src/.libs src/.deps doc/*.html doc/*.1 doc/*.txt