Fixes for bug #271848

diff --git a/ChangeLog b/ChangeLog
index 5fdc2fc55f39e344675cf7b0a634f988eb5d07ae..5d7af1ededae7ca2cca4db20d16c8ab96b0741a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-18     Dustin Kirkland <kirkland@canonical.com>
+       Minor packaging fixes
+       Release version 1.7
+
 2008-09-17     Dustin Kirkland <kirkland@canonical.com>
        Updated release for inclusion in Ubuntu main;
          simplified overall design, elminating the init

diff --git a/debian/changelog b/debian/changelog
index 538ce45493ffcbbfdc149bd60e91e2e7554f418e..b942b049ee4dde6c6cf219c6a135649c83663294 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+update-motd (1.7) intrepid; urgency=low
+
+  * Packaging suggestions (LP: #271848)
+  * debian/postinst: use lt-nl instead of lt
+  * debian/prerm: remove entirely
+  * debian/rules: use dh_installcron
+  * debian/update-motd.cron.d: ensure that the binary exists and is
+    executable when running the cronjob
+  * update-motd.cron: moved to debian/update-motd.cron.d
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 18 Sep 2008 14:37:47 -0500
+
 update-motd (1.6) intrepid; urgency=low
 
   * ChangeLog: fill in details of the last few releases

diff --git a/debian/postinst b/debian/postinst
index 390eb42815705a6c85138ab75bef07b0bd059afa..9242b09181131df9c0de11a9c0b3de0898b15305 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -4,7 +4,7 @@ set -e
 
 case "$1" in
        configure|reconfigure)
-               if dpkg --compare-versions "$2" lt "1.6"; then
+               if dpkg --compare-versions "$2" lt-nl "1.6"; then
                        # init script from older update-motd's should be removed
                        rm -f /etc/init.d/update-motd
                fi

diff --git a/debian/rules b/debian/rules
index 764b74416a2eb06de924c47b67e23e01787de8cc..79aa53c6e5ab9d69fedb0d680ee2d92e61ff8a43 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,6 @@ install: build-stamp
        dh_testroot
        dh_clean -k
        dh_installdirs
-       install -o root -g root -m 644 update-motd.cron debian/update-motd/etc/cron.d/update-motd
 
 # Build architecture-independent files here.
 binary-indep: install

diff --git a/update-motd.cron b/update-motd.cron
deleted file mode 100644 (file)
index f31f5c3..0000000
--- a/update-motd.cron
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/cron.d/update-motd: crontab fragment for update-motd
-#
-# Running 'update-motd' dynamically generates the /etc/motd with
-# a concatenation of output from each script in /etc/update-motd.d.
-
-*/10 * * * *   root    /usr/sbin/update-motd 2>/dev/null