Jamie Strandboge has proposed merging
lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain.lp1288241 into
lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain.
Requested reviews:
AppArmor Developers (apparmor-dev)
For more details, see:
https://code.launchpad.net/~apparmor-dev/apparmor/apparmor-ubuntu-citrain.lp1288241/+merge/212887
* autostart aa-notify via /etc/xdg/autostart instead of /etc/X11/Xsession.d
(LP: #1288241)
- remove debian/notify/90apparmor-notify
- add debian/notify/apparmor-notify.desktop
- debian/apparmor-notify.install: adjust for the above
- add debian/apparmor-notify.maintscript to remove 90apparmor-notify
* debian/notify/notify.conf: use_group should be set to "sudo" instead of
"admin" (LP: #1009666)
--
https://code.launchpad.net/~apparmor-dev/apparmor/apparmor-ubuntu-citrain.lp1288241/+merge/212887
Your team AppArmor Developers is requested to review the proposed merge of
lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain.lp1288241 into
lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain.
=== modified file 'debian/apparmor-notify.install'
--- debian/apparmor-notify.install 2010-11-04 07:27:37 +0000
+++ debian/apparmor-notify.install 2014-03-26 16:32:45 +0000
@@ -1,3 +1,3 @@
debian/notify/notify.conf /etc/apparmor/
-debian/notify/90apparmor-notify /etc/X11/Xsession.d/
+debian/notify/apparmor-notify.desktop /etc/xdg/autostart
usr/sbin/aa-notify /usr/bin/
=== added file 'debian/apparmor-notify.maintscript'
--- debian/apparmor-notify.maintscript 1970-01-01 00:00:00 +0000
+++ debian/apparmor-notify.maintscript 2014-03-26 16:32:45 +0000
@@ -0,0 +1,1 @@
+rm_conffile /etc/X11/Xsession.d/90apparmor-notify 2.8.95~2430-0ubuntu3~
=== modified file 'debian/changelog'
--- debian/changelog 2014-03-21 20:05:05 +0000
+++ debian/changelog 2014-03-26 16:32:45 +0000
@@ -2,8 +2,16 @@
* debian/lib/apparmor/functions: properly calculate number of profiles in
/var/lib/apparmor/profiles (LP: #1295816)
+ * autostart aa-notify via /etc/xdg/autostart instead of /etc/X11/Xsession.d
+ (LP: #1288241)
+ - remove debian/notify/90apparmor-notify
+ - add debian/notify/apparmor-notify.desktop
+ - debian/apparmor-notify.install: adjust for the above
+ - add debian/apparmor-notify.maintscript to remove 90apparmor-notify
+ * debian/notify/notify.conf: use_group should be set to "sudo" instead of
+ "admin" (LP: #1009666)
- -- Jamie Strandboge <[email protected]> Fri, 21 Mar 2014 15:04:14 -0500
+ -- Jamie Strandboge <[email protected]> Wed, 26 Mar 2014 10:34:34 -0500
apparmor (2.8.95~2430-0ubuntu2) trusty; urgency=medium
=== removed file 'debian/notify/90apparmor-notify'
--- debian/notify/90apparmor-notify 2010-11-05 00:12:29 +0000
+++ debian/notify/90apparmor-notify 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-# ------------------------------------------------------------------
-#
-# Copyright (C) 2010 Canonical Ltd.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of version 2 of the GNU General Public
-# License published by the Free Software Foundation.
-#
-# ------------------------------------------------------------------
-
-# Start up apparmor notify. It will read /etc/apparmor/notify.conf and
-# $HOME/.apparmor/notify.conf for configuration.
-if [ -x /usr/bin/aa-notify ]; then
- /usr/bin/aa-notify -p -s 1 -w 60
-fi
=== added file 'debian/notify/apparmor-notify.desktop'
--- debian/notify/apparmor-notify.desktop 1970-01-01 00:00:00 +0000
+++ debian/notify/apparmor-notify.desktop 2014-03-26 16:32:45 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=AppArmor Notify
+Comment=Receive on screen notifications of AppArmor denials
+TryExec=/usr/bin/aa-notify
+Exec=/usr/bin/aa-notify -p -s 1 -w 60
+StartupNotify=false
+NoDisplay=true
+X-Ubuntu-Gettext-Domain=aa-notify
=== modified file 'debian/notify/notify.conf'
--- debian/notify/notify.conf 2010-09-10 19:58:44 +0000
+++ debian/notify/notify.conf 2014-03-26 16:32:45 +0000
@@ -12,4 +12,4 @@
show_notifications="yes"
# Only people in use_group can use apparmor-notify
-use_group="admin"
+use_group="sudo"
--
AppArmor mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/apparmor
