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

Viewing all changes in revision 69.

  • Committer: Bazaar Package Importer
  • Author(s): Andres Rodriguez
  • Date: 2011-05-23 10:16:09 UTC
  • mfrom: (14.3.26 sid)
  • Revision ID: james.westby@ubuntu.com-20110523101609-iqqcad6kzo1zc2df
Tags: 2.2.19-1ubuntu1
* Merge from debian unstable (LP: #787013). 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: