Merge lp:~stolowski/unity-scope-mediascanner/agg-scope-ids-rtm into lp:unity-scope-mediascanner/rtm-14.09

Proposed by Paweł Stołowski
Status: Merged
Approved by: Michał Sawicz
Approved revision: 203
Merged at revision: 203
Proposed branch: lp:~stolowski/unity-scope-mediascanner/agg-scope-ids-rtm
Merge into: lp:unity-scope-mediascanner/rtm-14.09
Diff against target: 49 lines (+4/-2)
4 files modified
CMakeLists.txt (+1/-1)
debian/control (+1/-1)
src/musicaggregator/musicaggregator.ini.in (+1/-0)
src/videoaggregator/videoaggregator.ini.in (+1/-0)
To merge this branch: bzr merge lp:~stolowski/unity-scope-mediascanner/agg-scope-ids-rtm
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
Review via email: mp+244576@code.launchpad.net

Commit message

Set ids of aggreated scopes via ChildScopes ini option (cherry picked rev. 219 of trunk)

Description of the change

Set ids of aggreated scopes via ChildScopes ini option (cherry picked rev. 219 of trunk)

To post a comment you must log in.
Michał Sawicz (saviq) wrote :

As per upstream change.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-10-09 07:09:33 +0000
3+++ CMakeLists.txt 2014-12-12 12:55:28 +0000
4@@ -10,7 +10,7 @@
5 pkg_check_modules(GIO_DEPS REQUIRED gio-2.0 gio-unix-2.0)
6
7 pkg_check_modules(UNITY REQUIRED
8- "libunity-scopes >= 0.6.0"
9+ "libunity-scopes >= 0.6.9"
10 net-cpp>=1.1.0
11 jsoncpp
12 mediascanner-2.0
13
14=== modified file 'debian/control'
15--- debian/control 2014-09-16 15:45:45 +0000
16+++ debian/control 2014-12-12 12:55:28 +0000
17@@ -10,7 +10,7 @@
18 intltool,
19 libboost-regex-dev,
20 libmediascanner-2.0-dev (>= 0.105),
21- libunity-scopes-dev (>= 0.6.0),
22+ libunity-scopes-dev (>= 0.6.9),
23 libglib2.0-dev,
24 libsqlite3-dev,
25 mediascanner2.0,
26
27=== modified file 'src/musicaggregator/musicaggregator.ini.in'
28--- src/musicaggregator/musicaggregator.ini.in 2014-11-12 17:33:02 +0000
29+++ src/musicaggregator/musicaggregator.ini.in 2014-12-12 12:55:28 +0000
30@@ -7,6 +7,7 @@
31 _SearchHint=Search music
32 HotKey=
33 LocationDataNeeded=true
34+ChildScopes=mediascanner-music;com.ubuntu.scopes.mymusic_mymusic;com.canonical.scopes.grooveshark;com.canonical.scopes.sevendigital;com.ubuntu.scopes.soundcloud_soundcloud;com.canonical.scopes.songkick_songkick;com.ubuntu.scopes.youtube_youtube
35
36 [Appearance]
37 LogoOverlayColor=#26000000
38
39=== modified file 'src/videoaggregator/videoaggregator.ini.in'
40--- src/videoaggregator/videoaggregator.ini.in 2014-11-12 17:33:02 +0000
41+++ src/videoaggregator/videoaggregator.ini.in 2014-12-12 12:55:28 +0000
42@@ -6,6 +6,7 @@
43 Icon=./icon.png
44 _SearchHint=Search video
45 HotKey=
46+ChildScopes=mediascanner-video;com.ubuntu.scopes.myvideos_myvideos;com.ubuntu.scopes.youtube_youtube;com.ubuntu.scopes.vimeo_vimeo
47
48 [Appearance]
49 LogoOverlayColor=#26000000

Subscribers

People subscribed via source and target branches

to all changes: