Merge lp:~sylvain-pineau/checkbox/plainbox-packaging-policy into lp:~checkbox-dev/checkbox/plainbox-packaging

Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 12
Merged at revision: 11
Proposed branch: lp:~sylvain-pineau/checkbox/plainbox-packaging-policy
Merge into: lp:~checkbox-dev/checkbox/plainbox-packaging
Diff against target: 87 lines (+27/-8)
5 files modified
debian/changelog (+5/-2)
debian/control (+19/-6)
debian/plainbox-insecure-policy.install (+1/-0)
debian/plainbox-secure-policy.install (+1/-0)
debian/python3-plainbox.install (+1/-0)
To merge this branch: bzr merge lp:~sylvain-pineau/checkbox/plainbox-packaging-policy
Reviewer Review Type Date Requested Status
Sylvain Pineau Approve
Review via email: mp+163315@code.launchpad.net

Commit message

Adds the checkbox-trusted-launcher in /usr/bin and provides the virtual policy packages

Description of the change

Adds the checkbox-trusted-launcher in /usr/bin and provides the virtual policy packages

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

tested with dpkg-scanpackages locally

12. By Sylvain Pineau

Changelog updated

Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

Self-approval

tested locally: http://pastebin.ubuntu.com/5651043/

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 2013-04-23 20:48:30 +0000
3+++ debian/changelog 2013-05-10 13:00:36 +0000
4@@ -1,4 +1,3 @@
5-
6 plainbox (0.2-7) raring; urgency=low
7
8 [ Zygmunt Krynicki ]
9@@ -14,7 +13,11 @@
10 which posts the log files to an e-mailer CGI when the plainbox
11 jobs report they are finished.
12
13- -- Daniel Manrique <roadmr@ubuntu.com> Tue, 23 Apr 2013 16:47:13 -0400
14+ [ Sylvain Pineau]
15+ * Adds the checkbox-trusted-launcher in /usr/bin and provides the virtual
16+ policy packages.
17+
18+ -- Sylvain Pineau <sylvain.pineau@canonical.com> Fri, 10 May 2013 14:54:24 +0200
19
20 plainbox (0.2-6) raring; urgency=low
21
22
23=== modified file 'debian/control'
24--- debian/control 2013-04-23 20:48:30 +0000
25+++ debian/control 2013-05-10 13:00:36 +0000
26@@ -35,7 +35,8 @@
27 Package: python3-plainbox
28 Architecture: all
29 Section: python
30-Depends: python3-lxml,
31+Depends: plainbox-policy,
32+ python3-lxml,
33 python3-pkg-resources,
34 python3-requests (>= 1.0),
35 ${misc:Depends},
36@@ -70,15 +71,27 @@
37
38 Package: plainbox-autostart-desktop
39 Architecture: all
40-Depends: plainbox
41-Description: File(s) needed for starting plainbox automatically after login on a desktop install.
42+Depends: plainbox, plainbox-insecure-policy
43+Description: File(s) needed for starting PlainBox automatically after login on a desktop install.
44
45 Package: plainbox-autostart-server
46 Architecture: all
47-Depends: plainbox
48-Description: File(s) needed for starting plainbox automatically after boot on a server install.
49+Depends: plainbox, plainbox-insecure-policy
50+Description: File(s) needed for starting PlainBox automatically after boot on a server install.
51+
52+Package: plainbox-secure-policy
53+Architecture: all
54+Provides: plainbox-policy
55+Description: PolicyKit action file needed by PlainBox for prompting the password once.
56+
57+Package: plainbox-insecure-policy
58+Architecture: all
59+Provides: plainbox-policy
60+Conflicts: plainbox-policy
61+Replaces: plainbox-policy
62+Description: PolicyKit action file needed by PlainBox for running in headless mode without authentication.
63
64 Package: plainbox-ci-mailer
65 Architecture: all
66 Depends: curl, plainbox-autostart-server | plainbox-autostart-desktop
67-Description: Helper that e-mails plainbox output from autostart packages when run is finished.
68+Description: Helper that e-mails PlainBox output from autostart packages when run is finished.
69
70=== added file 'debian/plainbox-insecure-policy.install'
71--- debian/plainbox-insecure-policy.install 1970-01-01 00:00:00 +0000
72+++ debian/plainbox-insecure-policy.install 2013-05-10 13:00:36 +0000
73@@ -0,0 +1,1 @@
74+checkbox/plainbox/contrib/policykit_yes/org.freedesktop.policykit.pkexec.policy usr/share/polkit-1/actions/
75
76=== added file 'debian/plainbox-secure-policy.install'
77--- debian/plainbox-secure-policy.install 1970-01-01 00:00:00 +0000
78+++ debian/plainbox-secure-policy.install 2013-05-10 13:00:36 +0000
79@@ -0,0 +1,1 @@
80+checkbox/plainbox/contrib/policykit_auth_admin_keep/org.freedesktop.policykit.pkexec.policy usr/share/polkit-1/actions/
81
82=== modified file 'debian/python3-plainbox.install'
83--- debian/python3-plainbox.install 2013-03-08 21:08:27 +0000
84+++ debian/python3-plainbox.install 2013-05-10 13:00:36 +0000
85@@ -1,1 +1,2 @@
86 usr/lib/python3
87+usr/bin/checkbox-trusted-launcher

Subscribers

People subscribed via source and target branches