-
Committer:
Bazaar Package Importer
-
Author(s):
Martin Pitt
-
Date:
2009-11-11 15:04:27 UTC
-
mfrom:
(0.1.7 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20091111150427-elb822l63lnihaue
Tags: 2:1.1.0~rc2-1ubuntu1
* Merge with Debian testing. Remaining Ubuntu changes:
- debian/rules: cryptsetup is linked dynamically against libgcrypt and
libgpg-error.
- Upstart migration:
+ Add debian/cryptdisks-enable.upstart.
+ debian/cryptdisks{,-early}.init: Make the 'start' action of the init
script a no-op, this should be handled entirely by the upstart job.
(LP #473615)
+ debian/cryptsetup.postinst: Remove any symlinks from /etc/rcS.d on
upgrade.
+ debian/rules: Do not install start symlinks for those two, and install
debian/cryptdisks-enable.upstart scripts.
- Add debian/cryptsetup.apport: Apport package hook. Install in
debian/rules, and create dir in debian/cryptsetup.dirs.
- Start usplash in initramfs, since we need it for fancy passphrase input:
+ debian/initramfs/cryptroot-conf, debian/initramfs-conf.d: USPLASH=y
+ debian/control: Bump initramfs-tools Suggests to Depends:.