-
Committer:
Bazaar Package Importer
-
Author(s):
Martin Pitt
-
Date:
2007-10-23 17:36:30 UTC
-
mto:
This revision was merged to the branch mainline in
revision
4.
-
Revision ID:
james.westby@ubuntu.com-20071023173630-6q4agogsxuzujhwd
Tags: 4.0.3-7ubuntu1
* Merge with Debian; remaining Ubuntu changes:
- 07_norootpassword.dpatch: When locking a root-owned screen, check that
root has a password set. If not, ask for an unlocking key. (LP#6760)
- debian/preinst: Remove obsolete init script 'screen' on
upgrades. The script is called 'screen-cleanup' in Debian and thus
should be called the same in Ubuntu to avoid a permanent and pointless
delta. This needs to be kept until after the next LTS.