Merge lp://staging/~mterry/qtubuntu-media/modern-packaging into lp://staging/qtubuntu-media
Proposed by
Michael Terry
Status: | Merged |
---|---|
Approved by: | Ken VanDine |
Approved revision: | 20 |
Merged at revision: | 19 |
Proposed branch: | lp://staging/~mterry/qtubuntu-media/modern-packaging |
Merge into: | lp://staging/qtubuntu-media |
Diff against target: |
123 lines (+31/-28) 5 files modified
debian/changelog (+8/-0) debian/control (+16/-10) debian/copyright (+1/-1) debian/rules (+5/-16) unittests/unittests.pro (+1/-1) |
To merge this branch: | bzr merge lp://staging/~mterry/qtubuntu-media/modern-packaging |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+155265@code.staging.launchpad.net |
Commit message
Sort some Build-Depends, fix a typo in the copyright file, clean up the rules file, and fix the include path for the unittests.
Description of the change
Sort some Build-Depends, fix a typo in the copyright file, clean up the rules file, and fix the include path for the unittests.
To post a comment you must log in.
FAILED: Continuous integration, rev:17 jenkins. qa.ubuntu. com/job/ qtubuntu- media-ci/ 5/ jenkins. qa.ubuntu. com/job/ qtubuntu- media-quantal- armhf-ci/ 5/console jenkins. qa.ubuntu. com/job/ qtubuntu- media-raring- armhf-ci/ 1/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ qtubuntu- media-ci/ 5/rebuild
http://