-
Committer:
Jamie Strandboge
-
Date:
2011-03-24 13:22:11 UTC
-
mfrom:
(1422.1.1 apparmor-ubuntu)
-
Revision ID:
jamie@canonical.com-20110324132211-5zz6e2tnvrsocufg
merge 2.6.1 from sbeattie
* New upstream release.
- Fixes breakage of mod_apparmor apache2 module (LP: #737074)
- Fixes profile matching when an attachement doesn't contain a
regex (LP: #731155)
- Fixes parser acceptance of missing network protocols (LP: #732837)
- Patches taken upstream and dropped:
+ debian/patches/0002-lp727478.patch
+ debian/patches/0003-test-lp727478.patch
+ debian/patches/0004-lp736870.patch
* debian/apparmor.install, debian/apparmor.dirs: add new multiarch
tunable file and directory
* debian/python-libapparmor.install: loosen directory specification
for resiliancy against different python versions