Merge lp://qastaging/~sao/ubuntu/saucy/diodon/new_ext_api_plugins into lp://qastaging/ubuntu/saucy/diodon
Proposed by
Oliver Sauder
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 4 | ||||||||
| Proposed branch: | lp://qastaging/~sao/ubuntu/saucy/diodon/new_ext_api_plugins | ||||||||
| Merge into: | lp://qastaging/ubuntu/saucy/diodon | ||||||||
| Diff against target: |
653 lines (+496/-23) 13 files modified
.pc/01_port-to-zeitgeist-2.0.patch/plugins/zeitgeist/wscript_build (+25/-0) .pc/01_port-to-zeitgeist-2.0.patch/plugins/zeitgeist/zeitgeist-plugin.vala (+177/-0) .pc/01_port-to-zeitgeist-2.0.patch/wscript (+169/-0) .pc/applied-patches (+1/-0) debian/changelog (+9/-0) debian/control (+3/-4) debian/diodon-plugins.install (+0/-2) debian/patches/01_port-to-zeitgeist-2.0.patch (+91/-0) debian/patches/series (+1/-0) debian/rules (+1/-1) plugins/zeitgeist/wscript_build (+1/-1) plugins/zeitgeist/zeitgeist-plugin.vala (+17/-14) wscript (+1/-1) |
||||||||
| To merge this branch: | bzr merge lp://qastaging/~sao/ubuntu/saucy/diodon/new_ext_api_plugins | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jeremy Bícha | Approve | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
* This merge request currently disables the unity-lens to fix #1189154 so it compiles again. This is because of the scope api not 100& stable yet, but also due to the fact that upstream where there is quite a bit of changes going on which will affect the Lens resp. Scope as well. So this will be included in future releases again.
* This merge request also fixes #1197569 resp. ports zeitgeist to version 2.0.
* Valac dependency is now set to valac instead of valac-0.16
Sorry for the many changes in on merge request, just thought is the easiest to have all changes in one version and one go.
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
Thanks!