Merge lp://staging/~mardy/signon/packaging into lp://staging/signon
Proposed by
Alberto Mardegan
| Status: | Merged | ||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Robert Bruce Park | ||||||||||||||||||||
| Approved revision: | no longer in the source branch. | ||||||||||||||||||||
| Merged at revision: | 616 | ||||||||||||||||||||
| Proposed branch: | lp://staging/~mardy/signon/packaging | ||||||||||||||||||||
| Merge into: | lp://staging/signon | ||||||||||||||||||||
| Diff against target: |
494 lines (+134/-40) 29 files modified
.gitignore (+1/-0) common-project-config.pri (+3/-1) common-vars.pri (+1/-1) debian/changelog (+26/-0) debian/control (+4/-0) debian/libsignon-extension1.install (+1/-1) debian/libsignon-plugins-common1.install (+2/-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) lib/SignOn/SignOnQt5Config.cmake.in (+7/-0) lib/SignOn/SignOnQt5ConfigVersion.cmake.in (+10/-0) lib/SignOn/connection-manager.cpp (+1/-1) lib/SignOn/libsignon-qt.pri (+5/-5) lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp (+4/-3) lib/plugins/signon-plugins.pro (+0/-2) src/remotepluginprocess/remotepluginprocess.pro (+5/-2) src/signond/credentialsdb.cpp (+2/-0) src/signond/credentialsdb.h (+3/-0) src/signond/signonidentity.cpp (+22/-0) src/signond/signonidentity.h (+1/-0) tests/run-with-signond.sh (+1/-1) tests/signond-tests/databasetest.cpp (+11/-1) |
||||||||||||||||||||
| To merge this branch: | bzr merge lp://staging/~mardy/signon/packaging | ||||||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| David Barth (community) | Approve | ||
| Justin McPherson | Pending | ||
|
Review via email:
|
|||
Commit message
Upstream changes
- signond: fix passing of DBus maps to plugins
- lib: don't emit a critical warning on p2p socket failure
- Build: add CMake config files for Qt5
Description of the change
Upstream changes
- signond: fix passing of DBus maps to plugins
- lib: don't emit a critical warning on p2p socket failure
- Build: add CMake config files for Qt5
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| David Barth (dbarth) | # |
review:
Approve
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:616
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://