Merge lp://staging/~laney/signon/sync-archive into lp://staging/signon
Proposed by
Iain Lane
Status: | Needs review |
---|---|
Proposed branch: | lp://staging/~laney/signon/sync-archive |
Merge into: | lp://staging/signon |
Diff against target: |
197 lines (+44/-23) 13 files modified
debian/changelog (+14/-0) debian/control (+4/-0) debian/libsignon-extension1.install (+1/-1) debian/libsignon-plugins-common1.install (+1/-1) debian/libsignon-qt-dev.install (+3/-3) debian/libsignon-qt1.install (+1/-1) debian/libsignon-qt5-1.install (+1/-1) debian/libsignon-qt5-dev.install (+3/-3) debian/rules (+7/-4) debian/signon-plugin-password.install (+1/-1) debian/signon-plugin-ssotest.install (+1/-1) debian/signon-plugins-dev.install (+3/-3) debian/signond-dev.install (+4/-4) |
To merge this branch: | bzr merge lp://staging/~laney/signon/sync-archive |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Alberto Mardegan (community) | Approve | ||
Review via email: mp+218778@code.staging.launchpad.net |
Commit message
Sync uploads from the archive to move cmake files and build for multi-arch
Description of the change
Sync uploads from the archive to move cmake files and build for multi-arch
To post a comment you must log in.
Unmerged revisions
- 616. By Iain Lane
-
Sync archive uploads
* Changes to enable reverse-deps to be cross-built, since cross-pkg-config
no longer looks in /usr/lib/pkgconfig for pcfiles. (LP: #1316667)
* Install into Multi-Arch directories and set M-A: Same on library packages.
* In debian/rules move qt4 cmake files to not clash with qt5 cmake files
LGTM, thanks!