Merge lp://staging/~ted/url-dispatcher/devel into lp://staging/~fboucault/url-dispatcher/crossbuild_fixes
Proposed by
Ted Gould
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~ted/url-dispatcher/devel |
| Merge into: | lp://staging/~fboucault/url-dispatcher/crossbuild_fixes |
| Diff against target: |
2134 lines (+1222/-123) 49 files modified
CMakeLists.txt (+12/-4) data/CMakeLists.txt (+10/-0) data/bad-url.qml (+42/-0) data/url-dispatcher-update-user.conf.in (+1/-1) data/url-dispatcher.conf.in (+4/-0) debian/apparmor/url-dispatcher-bad-url-helper (+15/-0) debian/changelog (+23/-0) debian/control (+19/-0) debian/rules (+1/-0) debian/url-dispatcher-tools-gui.install (+2/-0) debian/url-dispatcher.install (+3/-0) gui/CMakeLists.txt (+13/-0) gui/url-dispatcher-gui.desktop.in (+6/-0) gui/url-dispatcher-gui.qml (+59/-0) gui/url-dispatcher-gui.svg (+129/-0) po/CMakeLists.txt (+39/-0) po/POTFILES.in (+1/-0) po/genpotfiles.sh (+6/-0) service/CMakeLists.txt (+11/-13) service/bad-url/CMakeLists.txt (+14/-0) service/bad-url/exec-tool.c (+42/-0) service/dispatcher.c (+141/-6) service/dispatcher.h (+2/-1) service/overlay-tracker-iface.h (+1/-0) service/overlay-tracker-mir.cpp (+69/-39) service/overlay-tracker-mir.h (+22/-8) service/overlay-tracker.cpp (+9/-0) service/overlay-tracker.h (+1/-0) service/scope-checker-facade.h (+27/-0) service/scope-checker.cpp (+114/-0) service/scope-checker.h (+29/-0) service/service.c (+9/-1) service/url-overlay/CMakeLists.txt (+14/-0) tests/CMakeLists.txt (+3/-0) tests/app-id-test.cc (+27/-29) tests/apparmor-mock.c (+36/-0) tests/apparmor-mock.h (+20/-0) tests/click-data/manifests/com.test.good.manifest (+1/-1) tests/click-data/manifests/com.test.multiple.manifest (+3/-3) tests/dispatcher-test.cc (+84/-1) tests/overlay-tracker-mock.h (+6/-0) tests/overlay-tracker-test.cpp (+41/-12) tests/scope-mock.h (+95/-0) tests/service-test.cc (+8/-3) tests/test-config.h.in (+1/-1) tests/ual-link-farm/com.test.good_app1_1.2.3.desktop (+1/-0) tests/ual-link-farm/com.test.multiple_app-first_1.2.3.desktop (+1/-0) tests/xdg-cache/libertine-container/container-id/rootfs/usr/share/applications/org.canonical.app1.desktop (+4/-0) tests/xdg-data/applications/foo-bar.desktop (+1/-0) |
| To merge this branch: | bzr merge lp://staging/~ted/url-dispatcher/devel |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Florian Boucault | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2016-09-20.
Commit message
Pull all the branches together for merge conflicts
Description of the change
The merge conflicts were too difficult to make easy sense of, so pulled everything into a single branch that we can then land. This is the combination of a whole host of branches.
To post a comment you must log in.
Unmerged revisions
- 108. By Ted Gould
-
Be more specific so that the packages don't conflict
- 107. By Ted Gould
-
Fixes from review
- 106. By Ted Gould
-
Forgot the container config
- 105. By Ted Gould
-
Merge issues from trunk
- 104. By Ted Gould
-
Updating changelog to have all the branches in it
- 103. By Ted Gould
-
Fixing the environment for the appid test
- 102. By Ted Gould
-
Bad URL prompt
- 101. By Ted Gould
- 100. By Ted Gould
- 99. By Ted Gould
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
