AppArmor

Merge lp://staging/~jpds/apparmor/fix_350820 into lp://staging/~ubuntu-core-dev/apparmor/ubuntu

  1. fix_350820
  2. Merge into ubuntu
Proposed by Jonathan Davies
Status: Merged
Merged at revision: 953
Proposed branch: lp://staging/~jpds/apparmor/fix_350820
Merge into: lp://staging/~ubuntu-core-dev/apparmor/ubuntu
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~jpds/apparmor/fix_350820
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Review via email: mp+5011@code.staging.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-03-27 20:59:18 +0000
3+++ debian/changelog 2009-03-29 09:57:58 +0000
4@@ -1,3 +1,10 @@
5+apparmor (2.3+1289-0ubuntu13) UNRELEASED; urgency=low
6+
7+ * profiles/apparmor.d/abstractions/python: Changed python2.6 entries to use
8+ dist-packages path (LP: #350820).
9+
10+ -- Jonathan Davies <jpds@ubuntu.com> Sun, 29 Mar 2009 10:56:05 +0100
11+
12 apparmor (2.3+1289-0ubuntu12) jaunty; urgency=low
13
14 * expand allowed library paths to handle unexpected architectures
15
16=== modified file 'profiles/apparmor.d/abstractions/python'
17--- profiles/apparmor.d/abstractions/python 2009-03-19 02:34:34 +0000
18+++ profiles/apparmor.d/abstractions/python 2009-03-29 09:57:58 +0000
19@@ -11,10 +11,12 @@
20 # ------------------------------------------------------------------
21
22 /usr/lib{,32,64}/python2.[456]/**.{egg,py,pyc,pth,so} mr,
23- /usr/lib{,32,64}/python2.[456]/site-packages/ r,
24+ /usr/lib{,32,64}/python2.[45]/site-packages/ r,
25+ /usr/lib{,32,64}/python2.6/dist-packages/ r,
26
27 /usr/local/lib{,32,64}/python2.[456]/**.{egg,py,pyc,pth,so} mr,
28- /usr/local/lib{,32,64}/python2.[456]/site-packages/ r,
29+ /usr/local/lib{,32,64}/python2.[45]/site-packages/ r,
30+ /usr/local/lib{,32,64}/python2.6/dist-packages/ r,
31
32 # Site-wide configuration
33 /etc/python2.[456]/** r,

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: