[pkg-apparmor] [apparmor-profiles-extra] 02/04: Merge remote-tracking branch 'origin/debfx/wip'

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to branch master
in repository apparmor-profiles-extra.

commit 95e15ec2f19eea85cfb0838276e8f40cb21db510
Merge: 5d64f5f 233fb21
Author: intrigeri <intrigeri at boum.org>
Date:   Wed Sep 10 21:50:09 2014 +0000

    Merge remote-tracking branch 'origin/debfx/wip'

 .gitignore                                         |  1 -
 debian/README.Debian                               |  3 +
 debian/apparmor-profiles-extra.dirs                |  2 -
 debian/apparmor-profiles-extra.install             |  1 +
 debian/control                                     |  2 +-
 debian/copyright                                   | 22 ++++++
 debian/rules                                       | 25 +++----
 .../generate-apparmor-profiles-extra.install       | 15 ----
 profiles/gst_plugin_scanner                        |  2 +
 profiles/tunables/ntpd                             | 15 ++++
 profiles/usr.bin.totem                             |  5 +-
 profiles/usr.sbin.ntpd                             | 81 ++++++++++++++++++++++
 12 files changed, 142 insertions(+), 32 deletions(-)

diff --cc debian/README.Debian
index 4611f9d,ccf3497..a141a05
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@@ -4,12 -4,13 +4,15 @@@ Included profile
  - Evince: taken from Ubuntu's evince 3.10.3-0ubuntu16; adapted a bit.
  - GStreamer abstraction, gst_plugin_scanner named profile: taken from
    the apparmor-profiles repository at revision 134.
 -- Pidgin: taken from the apparmor-profiles repository at revision 125.
 +- Pidgin: taken from the apparmor-profiles repository at revision 125,
 +  and added on top the changes proposed for merging upstream in
 +  lp:~intrigeri/apparmor-profiles/pidgin-vs-wildmidi.
  - Totem: taken from the apparmor-profiles repository at revision 134.
+   The profile has been modified to inline abstractions/dconf which isn't
+   available in AppArmor 2.8.
  - tcpdump: taken from Ubuntu's tcpdump 4.5.1-2ubuntu2.
  - irssi: taken from the apparmor-profiles repository at revision 132.
+ - ntpd: taken from Ubuntu's ntp 1:4.2.6.p5+dfsg-3ubuntu2.
  
  Sources
  =======

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/apparmor-profiles-extra.git