Merge lp://staging/~stolowski/unity-lens-files/merge-smartscopes into lp://staging/unity-lens-files

Proposed by Paweł Stołowski
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 258
Merged at revision: 254
Proposed branch: lp://staging/~stolowski/unity-lens-files/merge-smartscopes
Merge into: lp://staging/unity-lens-files
Diff against target: 1339 lines (+360/-410)
15 files modified
Makefile.am (+7/-7)
configure.ac (+16/-16)
data/Makefile.am (+2/-2)
data/unity-scope-files-local.service.in (+1/-1)
debian/changelog (+6/-0)
debian/control (+1/-1)
local.scope.in.in (+6/-5)
po/POTFILES.in (+1/-1)
src/Makefile.am (+5/-5)
src/daemon.vala (+293/-289)
src/locate.vala (+1/-1)
src/main.vala (+3/-3)
src/schemas.vala (+1/-20)
src/utils.vala (+15/-57)
tests/Makefile.am (+2/-2)
To merge this branch: bzr merge lp://staging/~stolowski/unity-lens-files/merge-smartscopes
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+164231@code.staging.launchpad.net

Commit message

Merge new scope API changes (100 scopes feature).

Description of the change

Merge new scope API changes (100 scopes feature).
Note: needs libunity 7.0.0 to land (should happen very soon).

To post a comment you must log in.
257. By Paweł Stołowski

Fixed requirement for libunity-dev.

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)
258. By Paweł Stołowski

Added changelog entry for 7.1.0.

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)
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Looks good, but it's late, soo... Anyway, approved!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches