Branches for Maverick

Author: Jamie Strandboge
Revision Date: 2010-08-24 14:56:42 UTC

* Merge from debian unstable for documentation updates and reading of
  /etc/default/locale. Remaining changes:
  - debian/control:
    + Build-Depends on debhelper >= 7.3.15ubuntu2, for Upstart
    + Drop MTA and lockfile-args to Suggests
  - add debian/cron.upstart
  - debian/postinst: remove calls to update-rc.d, invoke-rc.d and
    /etc/init.d/cron
  - debian/postrm: remove call to update-rc.d
  - debian/prerm: remove calls to invoke-rc.d and /etc/init.d/cron
  - debian/rules: install Upstart job