~ubuntu-branches/ubuntu/quantal/apache2/quantal

Viewing all changes in revision 73.

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-12-09 05:20:43 UTC
  • mfrom: (14.3.31 sid)
  • Revision ID: package-import@ubuntu.com-20111209052043-ueqp28b9fconxxg1
Tags: 2.2.21-3ubuntu1
* 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.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: