-
Committer:
Bazaar Package Importer
-
Author(s):
Kees Cook
-
Date:
2010-12-20 14:37:38 UTC
-
mfrom:
(1.1.15 upstream)
-
Revision ID:
james.westby@ubuntu.com-20101220143738-du4zssilz517q9y2
Tags: 2.6~devel+bzr1601-0ubuntu1
* Merge with upstream bzr revision 1601 to gain parser speed
improvements and man page fixes. Closes the following bugs:
- LP: #349049: document audit, deny and owner rule qualifiers
- LP: #466228: ubuntu-browsers.d/multimedia: allow flash printing
- LP: #644983: add ubuntu-browsers.d/ubuntu-integration-xul
- LP: #692216: use aa_change_hat() instead of change_hat()
- LP: #692217: add aa_change_profile.pod manpage
* debian/control: explicitly depend on gettext module.
* ship apparmor vim syntax file (LP: #646800):
- debian/vim-apparmor.yaml: vim addon definition file.
- debian/apparmor-utils.install: add apparmor.vim and vim-apparmor.yaml.
* debian/libapparmor1.manpages: ship aa_change_profile manpage.