lp:~unity-team/unity-scope-mediascanner/click-support

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:unity-scope-mediascanner/rtm-14.09 at revision 199

James Henstridge: Approve on 2014-11-13

Diff: 1064 lines (+450/-162)

38 files modified

CMakeLists.txt (+16/-10)
cmake/ClickBuild.cmake (+43/-0)
cmake/ClickScope.cmake (+33/-0)
cmake/Intltool.cmake (+17/-0)
config.h.in (+3/-0)
data/CMakeLists.txt (+0/-49)
po/CMakeLists.txt (+20/-10)
src/CMakeLists.txt (+0/-50)
src/musicaggregator/CMakeLists.txt (+39/-0)
src/musicaggregator/apparmor.json (+5/-0)
src/musicaggregator/manifest.json.in (+16/-0)
src/musicaggregator/musicaggregator.ini.in (+2/-3)
src/musicaggregator/musicaggregatorquery.cpp (+3/-3)
src/musicaggregator/musicaggregatorscope.cpp (+7/-1)
src/musicaggregator/onlinemusicresultforwarder.h (+1/-1)
src/mymusic/CMakeLists.txt (+29/-0)
src/mymusic/apparmor.json (+5/-0)
src/mymusic/manifest.json.in (+16/-0)
src/mymusic/mediascanner-music.ini.in (+2/-6)
src/mymusic/music-scope.cpp (+2/-2)
src/myvideos/CMakeLists.txt (+29/-0)
src/myvideos/apparmor.json (+5/-0)
src/myvideos/manifest.json.in (+16/-0)
src/myvideos/mediascanner-video.ini.in (+2/-5)
src/myvideos/video-scope.cpp (+2/-2)
src/utils/CMakeLists.txt (+11/-0)
src/utils/i18n.cpp (+32/-0)
src/utils/i18n.h (+8/-0)
src/videoaggregator/CMakeLists.txt (+37/-0)
src/videoaggregator/apparmor.json (+5/-0)
src/videoaggregator/manifest.json.in (+16/-0)
src/videoaggregator/videoaggregator.ini.in (+2/-2)
src/videoaggregator/videoaggregatorquery.cpp (+3/-3)
src/videoaggregator/videoaggregatorscope.cpp (+7/-1)
tests/CMakeLists.txt (+9/-9)
tests/test-music-scope.cpp (+2/-1)
tests/test-result-forwarder.cpp (+3/-3)
tests/test-video-scope.cpp (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

194. By Paweł Stołowski on 2014-11-12

Merged rtm, fixed conflicts.

193. By James Henstridge on 2014-10-10

Update scope screenshots.

192. By James Henstridge on 2014-10-09

Fix up Icon setting for "My Music" scope.

191. By James Henstridge on 2014-10-09

Remove the data directory, since data files have been moved to live with their corresponding scopes.

190. By James Henstridge on 2014-10-09

Merge from trunk fixing conflicts

189. By James Henstridge on 2014-10-09

Make aggregators pick the click version of local scopes when built in
click mode.

188. By James Henstridge on 2014-10-07

Build click packages in install dir.

187. By James Henstridge on 2014-10-07

Fix up setting locale dir when in click mode -- translations are one
directory up from the scope directory.

186. By James Henstridge on 2014-10-07

Don't run tests when cross compiling.

185. By James Henstridge on 2014-10-07

Make scopes look for translations in their scope directory when built as
click packages.