~ubuntu-branches/ubuntu/maverick/apache2/maverick

Viewing all changes in revision 52.

  • Committer: Bazaar Package Importer
  • Author(s): Jamie Strandboge
  • Date: 2009-11-12 16:09:30 UTC
  • mfrom: (14.3.6 sid)
  • Revision ID: james.westby@ubuntu.com-20091112160930-wahwjjvfbt26cp4o
Tags: 2.2.14-2ubuntu1
* Merge from debian testing, remaining changes:
  - debian/{control, rules}: Enable PIE hardening.
  - debian/{control, rules, pache2.2-common.ufw.profile}: Add ufw profiles.
  - debian/conrol: Add bzr tag and point it to our tree.
  - removed debian/patches/203_fix_legacy_ap_rputs_segfaults.dpatch: it was
    already dropped from 00list, so just remove the patch entirely

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: