updated to released version 1.4

diff --git a/debian/changelog b/debian/changelog
index a6863cb12c98cca71d68ecf86c3e2fb868fcdc80..0eeeea5efbe3a7bd1f82574acfae72b103171727 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+update-motd (1.4) intrepid; urgency=low
+
+  * debian/config: validate that 1<=FREQ_IN_MIN<=59, at most 5 times before
+    defaulting to FREQ_IN_MIN=10
+  * debian/templates: valid input is 1 to 59 minutes
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 15 Sep 2008 21:37:44 -0500
+
 update-motd (1.3) intrepid; urgency=low
 
   * debian/config: only ask freq-in-min question if update-motd is enabled,

diff --git a/debian/config b/debian/config
index 4e289a59566a5c2d050e1175a4cd74382578c796..84fd81cceefc4427d178c36575322f45a19424e0 100644 (file)
--- a/debian/config
+++ b/debian/config
@@ -26,6 +26,19 @@ db_go
 db_get $PACKAGE/enable
 RUN="${RET:-true}"
 if [ "$RUN" = "true" ]; then
-       db_input medium $PACKAGE/freq-in-min || true
+       TRIES=5
+       for i in `seq 1 $TRIES`; do
+               db_input medium $PACKAGE/freq-in-min || true
+               db_go
+               db_get $PACKAGE/freq-in-min
+               FREQ_IN_MIN="${RET:-0}"
+               if [ "$FREQ_IN_MIN" -ge 1 ] && [ "$FREQ_IN_MIN" -le 59 ]; then
+                       break
+               fi
+               if [ "$i" = "$TRIES" ]; then
+                       # After a few tries, default to 10
+                       FREQ_IN_MIN=10
+               fi
+       done
 fi
 db_go

diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 05f1747fc18bbf46007742f6688cb3a63643c9da..444d09f601c558f1d6c72f1ae691990c9f4f9ff9 100644 (file)
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: update-motd@packages.debian.org\n"
-"POT-Creation-Date: 2008-08-22 11:36+0100\n"
+"POT-Creation-Date: 2008-09-15 16:31-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,7 +33,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../templates:2001
-msgid "Frequency should update-motd run (every N minutes):"
+msgid "Frequency should update-motd run (every 1 to 59 minutes):"
 msgstr ""
 
 #. Type: string

diff --git a/debian/templates b/debian/templates
index c591625247f7b8038acd4fe3f71e4bd7d6056d0d..201df50ae71c582c35b9131956188237687a4724 100644 (file)
--- a/debian/templates
+++ b/debian/templates
@@ -8,7 +8,7 @@ _Description: Do you want update-motd to automatically update the system MOTD?
 Template: update-motd/freq-in-min
 Type: string
 Default: 10
-_Description: Frequency should update-motd run (every N minutes):
+_Description: Frequency should update-motd run (every 1 to 59 minutes):
  The MOTD status is updated in a cron job, that can run as frequently as
  every minute, or as infrequently as desired.  A higher frequency will
  negatively affect the overall system load.