Merge branch 'bzr/lp'

Conflicts:
	debian/changelog
	debian/update-motd.cron.d

diff --cc debian/changelog
index 60b40525212ccdfcfead6516041bb1f2b310fb14,ca0d7fcd1c09913ac387afba7df454ec715d437b..c1f36da3751c7fd6b690b29903f850f5927fce5f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,36 +1,37 @@@
- update-motd (1.10-debian1) unstable; urgency=low
 -update-motd (1.13) unreleased; urgency=low
++update-motd (1.12-debian1) unstable; urgency=low
  
 -  * 
 +  * First upload for Debian.
 +  * Run update-motd at reboot.
  
-  -- Andrew Ruthven <andrew@etc.gen.nz>  Mon, 09 Feb 2009 10:20:17 +1300
 - -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 05 Mar 2009 13:33:11 -0600
++ -- Andrew Ruthven <andrew@etc.gen.nz>  Mon, 06 Mar 2009 10:20:17 +1300
+ 
+ update-motd (1.12) jaunty; urgency=low
+ 
+   * Inotify support
+     - big thanks for Jon Bernard <jbernard@librato.com> for all his help!
+   * debian/control: suggest iwatch
+   * debian/dirs: add /etc/update-motd directory
+   * debian/install: install /etc/update-motd/iwatch.xml
+   * debian/iwatch.xml: iwatch configuration file
+   * debian/update-motd.cron.d: use the "d" argument for the 10-minute job
+   * update-motd:
+     - default FREQ to "d"
+     - default vars added for inotify
+     - usage statement updated accordingly
+     - ensure that the cronjobs are no-ops, if running in inotify mode
+     - handle starting/stopping inotify via --enable and --disable
+     - move the trap to the top, and make sure the lock is established
+     - do not run the /etc/update-motd.*/ scripts, if in inotify mode
+   * update-motd.1: documentation updated
+ 
+  -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 05 Mar 2009 13:20:14 -0600
+ 
+ update-motd (1.11) jaunty; urgency=low
+ 
+   * update-motd: don't fail the entire script, if renice/ionice fail,
+     LP: #331921; ionice to 'idle' rather than 'best-effort'
+ 
+  -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 05 Mar 2009 10:51:26 -0600
  
  update-motd (1.10) jaunty; urgency=low
  

diff --cc debian/control
Simple merge

diff --cc debian/update-motd.cron.d
index 99cd21e00be62a892a60c54de24edfc4fa6110b6,94299a3d5d36d30f8f49ade1cc650539cab8d6ef..b2ec3cc1edb0d3a1399e6c494a102c0b560578d1
--- 1/debian/update-motd.cron.d
--- 2/debian/update-motd.cron.d
+++ b/debian/update-motd.cron.d
@@@ -3,8 -3,7 +3,8 @@@
  # Running 'update-motd' dynamically generates the /etc/motd with
  # a concatenation of output from each script in /etc/update-motd.d/*
  
- @reboot               root    [ -x /usr/sbin/update-motd ] && /usr/sbin/update-motd 2>/dev/null
- */10 * * * *  root    [ -x /usr/sbin/update-motd ] && /usr/sbin/update-motd 2>/dev/null
++@reboot               root    [ -x /usr/sbin/update-motd ] && /usr/sbin/update-motd d 2>/dev/null
+ */10 * * * *  root    [ -x /usr/sbin/update-motd ] && /usr/sbin/update-motd d 2>/dev/null
  0 * * * *     root    [ -x /usr/sbin/update-motd ] && /usr/sbin/update-motd hourly 2>/dev/null
  0 0 * * *     root    [ -x /usr/sbin/update-motd ] && /usr/sbin/update-motd daily 2>/dev/null
  0 0 * * 0     root    [ -x /usr/sbin/update-motd ] && /usr/sbin/update-motd weekly 2>/dev/null