AppArmor

Merge lp:~xnox/apparmor/xnox-citrain into lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain

  1. xnox-citrain
  2. Merge into apparmor-ubuntu-citrain
Proposed by Dimitri John Ledkov
Status: Merged
Merge reported by: Steve Beattie
Merged at revision: not available
Proposed branch: lp:~xnox/apparmor/xnox-citrain
Merge into: lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain
Diff against target: 59 lines (+9/-4)
2 files modified
debian/changelog (+8/-0)
debian/control (+1/-4)
To merge this branch: bzr merge lp:~xnox/apparmor/xnox-citrain
Reviewer Review Type Date Requested Status
John Johansen Approve
Review via email: mp+220770@code.launchpad.net

Commit message

* debian/control: mark apparmor M-A:foreign, typically it's only needed
  for it's hosts tools, which some M-A:same packages exec.
* debian/control: drop using deprecated python*:Versions variables.

Description of the change

* debian/control: mark apparmor M-A:foreign, typically it's only needed
  for it's hosts tools, which some M-A:same packages exec.
* debian/control: drop using deprecated python*:Versions variables.

To post a comment you must log in.
Revision history for this message
John Johansen (jjohansen) wrote :

Looks good

Revision history for this message
John Johansen (jjohansen) :
review: Approve

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 2014-04-04 07:38:15 +0000
3+++ debian/changelog 2014-05-23 09:12:43 +0000
4@@ -1,3 +1,11 @@
5+apparmor (2.8.95~2430-0ubuntu6) UNRELEASED; urgency=medium
6+
7+ * debian/control: mark apparmor M-A:foreign, typically it's only needed
8+ for it's hosts tools, which some M-A:same packages exec.
9+ * debian/control: drop using deprecated python*:Versions variables.
10+
11+ -- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 23 May 2014 10:06:59 +0100
12+
13 apparmor (2.8.95~2430-0ubuntu5) trusty; urgency=medium
14
15 * debian/control: add versioned Breaks to apparmor for lxc, libvirt-bin,
16
17=== modified file 'debian/control'
18--- debian/control 2014-04-04 07:38:15 +0000
19+++ debian/control 2014-05-23 09:12:43 +0000
20@@ -10,6 +10,7 @@
21
22 Package: apparmor
23 Architecture: any
24+Multi-Arch: foreign
25 Pre-Depends: ${misc:Pre-Depends}
26 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, libapparmor-perl, lsb-base, initramfs-tools [linux-any], debconf
27 Breaks: libapache2-mod-apparmor (<< 2.5.1-0ubuntu3), apparmor-utils (<< 2.8.0-0ubuntu28), libvirt-bin (<< 1.2.2-0ubuntu9~), lightdm (<< 1.9.14-0ubuntu2~), lxc (<< 1.0.2-0ubuntu2~), apparmor-easyprof-ubuntu (<< 1.1.14)
28@@ -111,7 +112,6 @@
29 Section: python
30 Architecture: any
31 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
32-XS-Python-Version: ${python:Versions}
33 Description: AppArmor library Python bindings
34 This provides the Python module that contains the language bindings
35 for the AppArmor library, libapparmor, which were autogenerated via
36@@ -121,7 +121,6 @@
37 Section: python
38 Architecture: any
39 Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
40-XS-Python-Version: ${python3:Versions}
41 Description: AppArmor library Python3 bindings
42 This provides the Python3 module that contains the language bindings
43 for the AppArmor library, libapparmor, which were autogenerated via
44@@ -131,7 +130,6 @@
45 Section: python
46 Architecture: any
47 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-libapparmor, python-pkg-resources
48-XS-Python-Version: ${python:Versions}
49 Description: AppArmor Python utility library
50 This provides the Python modules that implement the higher-level AppArmor
51 applications.
52@@ -142,7 +140,6 @@
53 Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}, python3-libapparmor, python3-pkg-resources
54 Breaks: apparmor-easyprof ( << 2.8.95~2385-0ubuntu1 )
55 Replaces: apparmor-easyprof ( << 2.8.95~2385-0ubuntu1 )
56-XS-Python-Version: ${python3:Versions}
57 Description: AppArmor Python3 utility library
58 This provides the Python3 modules that implement the higher-level AppArmor
59 applications.

Subscribers

People subscribed via source and target branches