* 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.