Merge lp:~jdstrand/ubuntu-app-launch/upstart-app-launch-lp1197047 into lp:ubuntu-app-launch/13.10

Proposed by Jamie Strandboge on 2013-09-04
Status: Merged
Approved by: Ted Gould on 2013-09-09
Approved revision: 47
Merged at revision: 51
Proposed branch: lp:~jdstrand/ubuntu-app-launch/upstart-app-launch-lp1197047
Merge into: lp:ubuntu-app-launch/13.10
Diff against target: 37 lines (+3/-2)
3 files modified
application-legacy.conf.in (+1/-1)
debian/control (+1/-0)
desktop-hook.c (+1/-1)
To merge this branch: bzr merge lp:~jdstrand/ubuntu-app-launch/upstart-app-launch-lp1197047
Reviewer Review Type Date Requested Status
Ted Gould (community) 2013-09-04 Approve on 2013-09-09
PS Jenkins bot (community) continuous-integration Approve on 2013-09-04
Review via email: mp+183953@code.launchpad.net

Commit message

application-legacy.conf.in: use aa-exec-click instead of aa-exec
desktop-hook.c: use aa-exec-click instead of aa-exec (LP: #1197047)
debian/control: Depends on click-apparmor

Description of the change

application-legacy.conf.in: use aa-exec-click instead of aa-exec
desktop-hook.c: use aa-exec-click instead of aa-exec
debian/control: Depends on click-apparmor

To post a comment you must log in.
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'application-legacy.conf.in'
2--- application-legacy.conf.in 2013-08-11 19:55:47 +0000
3+++ application-legacy.conf.in 2013-09-04 18:37:27 +0000
4@@ -16,7 +16,7 @@
5 if [ -z $APP_EXEC_POLICY ]; then
6 exec $APP_EXEC
7 else
8- exec aa-exec -p "$APP_EXEC_POLICY" -- $APP_EXEC
9+ exec aa-exec-click -p "$APP_EXEC_POLICY" -- $APP_EXEC
10 fi
11 end script
12
13
14=== modified file 'debian/control'
15--- debian/control 2013-08-09 20:42:45 +0000
16+++ debian/control 2013-09-04 18:37:27 +0000
17@@ -25,6 +25,7 @@
18 Depends: ${shlibs:Depends},
19 ${misc:Depends},
20 click,
21+ click-apparmor,
22 Description: Upstart Job for Launching Applications
23 Upstart Job file and associated utilities that is used to launch
24 applications in a standard and confined way.
25
26=== modified file 'desktop-hook.c'
27--- desktop-hook.c 2013-08-11 19:34:25 +0000
28+++ desktop-hook.c 2013-09-04 18:37:27 +0000
29@@ -208,7 +208,7 @@
30 g_key_file_set_string(keyfile, "Desktop Entry", "Path", path);
31 g_free(path);
32
33- gchar * newexec = g_strdup_printf("aa-exec -p %s -- %s", app_id, oldexec);
34+ gchar * newexec = g_strdup_printf("aa-exec-click -p %s -- %s", app_id, oldexec);
35 g_key_file_set_string(keyfile, "Desktop Entry", "Exec", newexec);
36 g_free(newexec);
37 g_free(oldexec);

Subscribers

People subscribed via source and target branches