-
Committer:
Bazaar Package Importer
-
Author(s):
Chuck Short
-
Date:
2011-10-14 16:01:29 UTC
-
mfrom:
(14.3.30 sid)
-
Revision ID:
james.westby@ubuntu.com-20111014160129-tetbckwjkurd20sv
Tags: 2.2.21-2ubuntu1
* Merge from debian unstable. Remaining changes:
- debian/{control, rules}: Enable PIE hardening.
- debian/{control, rules, apache2.2-common.ufw.profile}: Add ufw profiles.
- debian/control: Add bzr tag and point it to our tree
- debian/apache2.py, debian/apache2.2-common.install: Add apport hook.
- debian/control, debian/ask-for-passphrase, debian/config-dir/mods-available/ssl.conf:
Plymouth aware passphrase dialog program ask-for-passphrase.