Merge lp://qastaging/~roadmr/checkbox/packaging-sync-with-checkbox into lp://qastaging/~checkbox-dev/checkbox/checkbox-packaging
Proposed by
Daniel Manrique
| Status: | Merged |
|---|---|
| Approved by: | Zygmunt Krynicki |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 20 |
| Proposed branch: | lp://qastaging/~roadmr/checkbox/packaging-sync-with-checkbox |
| Merge into: | lp://qastaging/~checkbox-dev/checkbox/checkbox-packaging |
| Diff against target: |
876 lines (+279/-110) 34 files modified
debian/changelog (+70/-5) debian/compat (+1/-1) debian/control (+91/-27) debian/plainbox-provider-certification-client.install (+3/-0) debian/plainbox-provider-certification-server-soc.install (+3/-0) debian/plainbox-provider-certification-server.install (+3/-0) debian/plainbox-provider-checkbox.install (+5/-0) debian/plainbox-provider-checkbox.lintian-overrides (+5/-0) debian/plainbox-provider-resource-generic.install (+3/-0) debian/po/ast.po (+2/-2) debian/po/cs.po (+2/-2) debian/po/de.po (+2/-2) debian/po/en_AU.po (+24/-24) debian/po/en_GB.po (+2/-2) debian/po/es.po (+2/-2) debian/po/fr.po (+2/-2) debian/po/gl.po (+2/-2) debian/po/he.po (+2/-2) debian/po/hu.po (+2/-2) debian/po/id.po (+2/-2) debian/po/it.po (+2/-2) debian/po/ja.po (+2/-2) debian/po/nl.po (+2/-2) debian/po/oc.po (+2/-2) debian/po/pl.po (+2/-2) debian/po/pt_BR.po (+2/-2) debian/po/ro.po (+2/-2) debian/po/ru.po (+2/-2) debian/po/tr.po (+2/-2) debian/po/uk.po (+2/-2) debian/po/zh_CN.po (+2/-2) debian/po/zh_TW.po (+2/-2) debian/python3-checkbox.install (+1/-0) debian/rules (+26/-9) |
| To merge this branch: | bzr merge lp://qastaging/~roadmr/checkbox/packaging-sync-with-checkbox |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Zygmunt Krynicki (community) | Approve | ||
|
Review via email:
|
|||
Commit message
This brings the packaging branch in sync with checkbox's debian directory. I (hopefully) applied all the checkbox-old changes correctly and packages do build, though I don't guarantee they make sense once installed :)
Description of the change
This brings the packaging branch in sync with checkbox's debian directory. I (hopefully) applied all the checkbox-old changes correctly and packages do build, though I don't guarantee they make sense once installed :)
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
+1