~ubuntu-branches/ubuntu/oneiric/apache2/oneiric

Viewing all changes in revision 67.

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2011-02-22 13:02:08 UTC
  • mfrom: (14.3.23 sid)
  • Revision ID: james.westby@ubuntu.com-20110222130208-5hrxnun6a8uygfhv
Tags: 2.2.17-1ubuntu1
* 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
  - debain/apache2.py, debian/apache2.2-common.isntall: 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: