Checkbox

Merge lp://staging/~brendan-donegan/checkbox/bug1188601 into lp://staging/checkbox

  1. bug1188601
  2. Merge into trunk
Proposed by Brendan Donegan
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 2176
Merged at revision: 2183
Proposed branch: lp://staging/~brendan-donegan/checkbox/bug1188601
Merge into: lp://staging/checkbox
Diff against target: 39 lines (+6/-2)
2 files modified
checkbox-old/debian/changelog (+2/-0)
checkbox-old/debian/rules (+4/-2)
To merge this branch: bzr merge lp://staging/~brendan-donegan/checkbox/bug1188601
Reviewer Review Type Date Requested Status
Brendan Donegan (community) Approve
Zygmunt Krynicki (community) Approve
Review via email: mp+168890@code.staging.launchpad.net

Description of the change

 When creating the checkbox-hw-collection package, debian/rules was not updated to refer to it, so it wasn't getting treated in the same way as packages like checkbox-qt. The most important side-effect of this was that dpkg --purge didn't work properly to remove the checkbox-hw-collection.ini file.

Added reference to checkbox-hw-collection in debian/rules so that it's treated like the other checkbox derived packages.

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

seems broken on tabs/spaces

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

also, could you not change the unrelated parts of debian/changelog

Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

I'm unsure how that got touched. Anyway, updated now.

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

+1

review: Approve
Revision history for this message
Daniel Manrique (roadmr) wrote :

Attempt to merge into lp:checkbox failed due to conflicts:

text conflict in checkbox-old/debian/changelog

Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

Self-approving after fixing conflict

review: Approve
Revision history for this message
Daniel Manrique (roadmr) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Revision history for this message
Daniel Manrique (roadmr) wrote :

The attempt to merge lp:~brendan-donegan/checkbox/bug1188601 into lp:checkbox failed. Below is the output from the failed tests.

[precise] Bringing VM 'up'
[precise] Unable to 'up' VM!
[precise] stdout: http://paste.ubuntu.com/5761070/
[precise] stderr: http://paste.ubuntu.com/5761071/
[precise] NOTE: unable to execute tests, marked as failed
[precise] Destroying failed VM to reclaim resources
[precise] Destroying VM and associated drives...
[quantal] Bringing VM 'up'
[quantal] Unable to 'up' VM!
[quantal] stdout: http://paste.ubuntu.com/5761072/
[quantal] stderr: http://paste.ubuntu.com/5761073/
[quantal] NOTE: unable to execute tests, marked as failed
[quantal] Destroying failed VM to reclaim resources
[quantal] Destroying VM and associated drives...
[raring] Bringing VM 'up'
[raring] Unable to 'up' VM!
[raring] stdout: http://paste.ubuntu.com/5761076/
[raring] stderr: http://paste.ubuntu.com/5761077/
[raring] NOTE: unable to execute tests, marked as failed
[raring] Destroying failed VM to reclaim resources
[raring] Destroying VM and associated drives...
[saucy] Bringing VM 'up'
[saucy] Unable to 'up' VM!
[saucy] stdout: http://paste.ubuntu.com/5761078/
[saucy] stderr: http://paste.ubuntu.com/5761079/
[saucy] NOTE: unable to execute tests, marked as failed
[saucy] Destroying failed VM to reclaim resources
[saucy] Destroying VM and associated drives...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches