-
Committer:
Package Import Robot
-
Author(s):
Chuck Short
-
Date:
2012-01-09 06:26:31 UTC
-
mfrom:
(14.3.33 sid)
-
Revision ID:
package-import@ubuntu.com-20120109062631-bcd05li781ybizp4
Tags: 2.2.21-5ubuntu1
* Merge from Debian testing. 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.