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

Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 25
Merged at revision: 24
Proposed branch: lp:~sylvain-pineau/checkbox/packaging_fixes
Merge into: lp:~checkbox-dev/checkbox/checkbox-packaging
Diff against target: 35 lines (+4/-3)
2 files modified
debian/control (+3/-1)
debian/rules (+1/-2)
To merge this branch: bzr merge lp:~sylvain-pineau/checkbox/packaging_fixes
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+192670@code.launchpad.net

Description of the change

Small changes but huge benefits, should fix and restore ppa builds and allow correct checkbox updates.

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

self-approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2013-10-23 07:01:09 +0000
3+++ debian/control 2013-10-25 10:23:24 +0000
4@@ -46,7 +46,7 @@
5 Depends: debconf,
6 gir1.2-gudev-1.0,
7 policykit-1,
8- python3-checkbox,
9+ python3-checkbox (>= 0.16.13+bzr2469),
10 python3-lxml,
11 udev,
12 udisks2 | udisks,
13@@ -133,6 +133,8 @@
14 udisks2 | udisks,
15 ${misc:Depends},
16 ${python3:Depends}
17+Replaces: checkbox (<< 0.16.13+bzr2469)
18+Breaks: checkbox (<< 0.16.13+bzr2469)
19 Description: CheckBox python3 library
20 This package contains the CheckBox python3 library needed by some jobs.
21
22
23=== modified file 'debian/rules'
24--- debian/rules 2013-10-24 15:35:27 +0000
25+++ debian/rules 2013-10-25 10:23:24 +0000
26@@ -95,8 +95,7 @@
27 # dh_python3 runs automatically on packages with the python3- prefix
28 # let's not forget plainbox
29 dh_python3 --package=plainbox
30- # Provider packages not only ship python scripts but bash as well.
31- dh_python3 --ignore-shebangs --no-shebang-rewrite
32+ dh_python3
33
34 override_dh_installdeb:
35 cp debian/checkbox.postrm debian/checkbox-cli.postrm

Subscribers

People subscribed via source and target branches