~ubuntu-branches/ubuntu/saucy/apache2/saucy

Viewing all changes in revision 77.

  • Committer: Package Import Robot
  • Author(s): Robie Basak
  • Date: 2012-06-08 11:37:31 UTC
  • mfrom: (14.3.39 sid)
  • Revision ID: package-import@ubuntu.com-20120608113731-lapfog4y8do2sdfv
Tags: 2.2.22-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/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.
* Dropped changes:
  - debian/control: Add bzr tag and point it to our tree; this is not 
    really required and just increases the delta.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: