Created by Steve Beattie on 2011-05-31 and last modified on 2011-05-31
Get this branch:
bzr branch lp:~sbeattie/apparmor/apparmor-ubuntu-lp788616
Only Steve Beattie can upload to this branch. If you are Steve Beattie please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Steve Beattie

Recent revisions

1428. By Steve Beattie on 2011-05-31

debian/lib/apparmor/functions: adjust configured_profile_names()
to filter based on the proper hatname/child profile separator.
(LP: #788616)

1427. By Kees Cook on 2011-05-02

merge with Debian packaging

1426. By Jamie Strandboge on 2011-04-18

Release 2.6.1-0ubuntu3

* debian/patches/0003-add-debian-integration-to-lighttpd.patch: updates for
  lighttpd example profile to work in Debian/Ubuntu (LP: #582814)
* debian/patches/0004-lp754889.patch: add several image viewers to
  ubuntu-browsers.d/multimedia abstraction (LP: #754889)
* debian/patches/0005-lp761217.patch: abstractions/private-files updates for
  zsh and several other shells (LP: #761217)
* debian/patches/0001-add-chromium-browser.patch: fixes for multiarch and
  crash reporter (LP: #764786)

1425. By Jamie Strandboge on 2011-04-07

release 2.6.1-0ubuntu2

debian/patches/0002-lp750381.path: adjust ubuntu-media-players abstraction
to allow reading of configs required by gnash and owner writing of
@{HOME}/.gnash (LP: #750381)

1424. By Jamie Strandboge on 2011-03-24

released 2.6.1-0ubuntu1

1423. By Jamie Strandboge on 2011-03-24

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

1422. By Steve Langasek on 2011-03-22

releasing version 2.6.0-0ubuntu4

1421. By Steve Langasek on 2011-03-22

* Update debian/patches/0004-lp736870.patch (LP: #736870):
  - armel triplet doesn't match '*-linux-gnu'
  - /lib/tls for libc6-xen needs handling
  - gnome, kde, kerberosclient, and authentication abstractions also need
    updating for multiarch.

1420. By Jamie Strandboge on 2011-03-22

meh, adjust 0002-lp727478.patch and 0003-test-lp727478.patch to what we
actually used

1419. By Jamie Strandboge on 2011-03-22

actually add debian/patches/0004-lp736870.patch. d'oh!

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.