Merge lp://qastaging/~roadmr/checkbox/packaging-sync-packaging into lp://qastaging/~checkbox-dev/checkbox/checkbox-packaging
Proposed by
Daniel Manrique
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Zygmunt Krynicki | ||||
| Approved revision: | 14 | ||||
| Merged at revision: | 11 | ||||
| Proposed branch: | lp://qastaging/~roadmr/checkbox/packaging-sync-packaging | ||||
| Merge into: | lp://qastaging/~checkbox-dev/checkbox/checkbox-packaging | ||||
| Diff against target: |
154 lines (+27/-22) 8 files modified
debian/checkbox-cli.install (+1/-1) debian/checkbox-gtk.install (+2/-2) debian/checkbox-qt.install (+2/-2) debian/checkbox-urwid.install (+1/-1) debian/checkbox.install (+10/-9) debian/checkbox.postinst (+3/-0) debian/control (+4/-5) debian/rules (+4/-2) |
||||
| To merge this branch: | bzr merge lp://qastaging/~roadmr/checkbox/packaging-sync-packaging | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Zygmunt Krynicki (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Syncs the packaging branches. The only differences should be:
- changelog differences
- checkbox-packaging references checkbox-old in some places.
- checkbox-packaging refers to itself in the control Vcs-Bzr field.
Description of the change
Syncs the packaging branches. The only differences should be:
- changelog differences
- checkbox-packaging references checkbox-old in some places.
- checkbox-packaging refers to itself in the control Vcs-Bzr field.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good, +1