lp:~mterry/unity-scopes-api/snap-root

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:unity-scopes-api/devel at revision 692

Michi Henning (community): Approve on 2016-10-17

unity-api-1-bot: Approve (continuous-integration) on 2016-10-17

Diff: 155 lines (+36/-9)

7 files modified

data/scope-registry.conf.in (+1/-1)
data/smart-scopes-proxy.conf.in (+1/-1)
include/unity/scopes/internal/ConfigBase.h (+2/-0)
src/scopes/internal/ConfigBase.cpp (+18/-1)
src/scopes/internal/RegistryConfig.cpp (+2/-2)
src/scopes/internal/RuntimeConfig.cpp (+4/-4)
src/scopes/internal/ScopeConfig.cpp (+8/-0)

api

Superseded for merging into lp:unity-scopes-api

Michi Henning (community): Needs Fixing on 2016-10-14

Diff: 198 lines (+42/-15)

9 files modified

data/scope-registry.conf.in (+1/-1)
data/smart-scopes-proxy.conf.in (+1/-1)
doc/tutorial.dox (+2/-1)
include/unity/scopes/internal/ConfigBase.h (+2/-0)
src/scopes/internal/ConfigBase.cpp (+18/-1)
src/scopes/internal/RegistryConfig.cpp (+2/-2)
src/scopes/internal/RuntimeConfig.cpp (+4/-4)
src/scopes/internal/ScopeConfig.cpp (+11/-4)
test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1629009: Does not work inside a snap due to hardcoded paths

High

Fix Released

Link a bug report

Related blueprints

375. By Michael Terry on 2016-10-17

Merge devel

374. By Michael Terry on 2016-10-16

Apply Michi's patch to fix review nits, thanks

373. By Michael Terry on 2016-10-06

Add $SNAP to Art and Icon keys too, if needed

372. By Michael Terry on 2016-10-06

Account for empty dflt_file

371. By Michael Terry on 2016-10-05

Pay attention to $SNAP prefix

370. By CI Train Bot Account on 2016-09-21

Releasing 1.0.7+16.10.20160921-0ubuntu1

369. By CI Train Bot Account on 2016-09-21

* Fixed potential login deadlock in OnlineAccountClient.
* Increased upper timeout limits to 60s to assist scope-harness testing on slow builders.
* Fixes for building with Florian Boucault's crossbuilder.
* Fix for bug #1548718: Need to update micro version in shlibs file when symbols are added
* Marked the push(Filters const&, FilterState const&) method of SearchReply
  and SearchListenerBase as deprecated and provided push methods which take
  the Filters argument only.
* Fixed Yakkety build by adding missing #includes
* Fixed arm64 build by temporarily disabling SmartScopesClient_test

368. By CI Train Bot Account on 2016-06-17

Releasing 1.0.6+16.10.20160617-0ubuntu1

367. By CI Train Bot Account on 2016-06-17

* Got rid of category header background, as per design (Bug #1446216).
* Re-enabled license/copyright test for xenial+.
* Removed libjson-cpp and replaced with json-glib based implementation (Bug #1360247).
* Fixed Yakkety build.
* No-change rebuild.
* No-change rebuild of latest xenial trunk against current archive.

366. By CI Train Bot Account on 2016-04-13

Releasing 1.0.5+16.04.20160413.1-0ubuntu1