Merge lp:~sylvain-pineau/checkbox/checkbox-packaging-depends-python3-checkbox into lp:~checkbox-dev/checkbox/checkbox-packaging

Proposed by Sylvain Pineau
Status: Merged
Approved by: Zygmunt Krynicki
Approved revision: 22
Merged at revision: 21
Proposed branch: lp:~sylvain-pineau/checkbox/checkbox-packaging-depends-python3-checkbox
Merge into: lp:~checkbox-dev/checkbox/checkbox-packaging
Diff against target: 33 lines (+1/-8)
3 files modified
debian/checkbox-gtk.postinst (+0/-7)
debian/checkbox.install (+0/-1)
debian/control (+1/-0)
To merge this branch: bzr merge lp:~sylvain-pineau/checkbox/checkbox-packaging-depends-python3-checkbox
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Review via email: mp+191990@code.launchpad.net

Description of the change

To avoid installation conflicts between checkbox and python3-checkbox, checkbox now depends on python3-checkbox

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

Looks good. I would also check if that can be upgraded without fist uninstalling anything but it seems ok to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'debian/checkbox-gtk.postinst'
2--- debian/checkbox-gtk.postinst 2013-06-01 14:18:12 +0000
3+++ debian/checkbox-gtk.postinst 1970-01-01 00:00:00 +0000
4@@ -1,7 +0,0 @@
5-#! /bin/sh -e
6-
7-base_package="checkbox"
8-. /usr/share/debconf/confmodule
9-. /usr/share/checkbox/install/postinst
10-
11-#DEBHELPER#
12
13=== modified file 'debian/checkbox.install'
14--- debian/checkbox.install 2013-07-05 19:59:47 +0000
15+++ debian/checkbox.install 2013-10-21 13:42:14 +0000
16@@ -1,5 +1,4 @@
17 usr/lib/checkbox/bin/*
18-usr/lib/python*/*-packages/checkbox/*
19 usr/share/apport/general-hooks/checkbox.py
20 usr/share/apport/package-hooks/source_checkbox.py
21 usr/share/checkbox/backend
22
23=== modified file 'debian/control'
24--- debian/control 2013-10-18 20:40:55 +0000
25+++ debian/control 2013-10-21 13:42:14 +0000
26@@ -26,6 +26,7 @@
27 Depends: debconf,
28 gir1.2-gudev-1.0,
29 policykit-1,
30+ python3-checkbox,
31 python3-lxml,
32 udev,
33 udisks2 | udisks,

Subscribers

People subscribed via source and target branches