Merge lp:~roadmr/checkbox/packaging-remove-gksu-add-polkit-depends into lp:~checkbox-dev/checkbox/checkbox-packaging

Proposed by Daniel Manrique
Status: Merged
Approved by: Zygmunt Krynicki
Approved revision: 8
Merged at revision: 10
Proposed branch: lp:~roadmr/checkbox/packaging-remove-gksu-add-polkit-depends
Merge into: lp:~checkbox-dev/checkbox/checkbox-packaging
Diff against target: 19 lines (+1/-1)
1 file modified
debian/control (+1/-1)
To merge this branch: bzr merge lp:~roadmr/checkbox/packaging-remove-gksu-add-polkit-depends
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Review via email: mp+171931@code.launchpad.net

Description of the change

This mirrors the removal of gksu and addition of policykit-1 as needed by:

https://code.launchpad.net/~roadmr/checkbox/1097816-pkexec/+merge/171930

So please, before merging this, ensure that the other one is already in trunk.

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

+1

review: Approve
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

There is no tarmac support for this one. We should probably add it rather than merge it manually.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2013-06-27 18:28:42 +0000
+++ debian/control 2013-06-27 23:08:34 +0000
@@ -26,6 +26,7 @@
26Architecture: any26Architecture: any
27Depends: debconf,27Depends: debconf,
28 python3-lxml,28 python3-lxml,
29 policykit-1,
29 udev,30 udev,
30 gir1.2-gudev-1.0,31 gir1.2-gudev-1.0,
31 udisks2 | udisks,32 udisks2 | udisks,
@@ -94,7 +95,6 @@
94Architecture: all95Architecture: all
95Depends: checkbox (>= ${source:Version}),96Depends: checkbox (>= ${source:Version}),
96 gir1.2-gtk-3.0,97 gir1.2-gtk-3.0,
97 gksu,
98 python3-gi,98 python3-gi,
99 python3-gi-cairo,99 python3-gi-cairo,
100 ${misc:Depends}100 ${misc:Depends}

Subscribers

People subscribed via source and target branches