~clint-fewbar/ubuntu/precise/apache2/fix-ask-for-passphrase

Viewing all changes in revision 64.

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2011-01-02 06:05:51 UTC
  • mfrom: (14.3.22 sid)
  • Revision ID: james.westby@ubuntu.com-20110102060551-6daszu6s0locotzo
Tags: 2.2.16-6ubuntu1
* 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: