Merge lp:~townsend/unity-lens-music/fix-icon-path.trusty.SRU into lp:unity-lens-music/saucy

Proposed by Christopher Townsend on 2015-07-23
Status: Superseded
Proposed branch: lp:~townsend/unity-lens-music/fix-icon-path.trusty.SRU
Merge into: lp:unity-lens-music/saucy
Diff against target: 38 lines (+8/-2)
3 files modified
debian/changelog (+6/-0)
m4/gcov.m4 (+1/-1)
src/rhythmbox-collection.vala (+1/-1)
To merge this branch: bzr merge lp:~townsend/unity-lens-music/fix-icon-path.trusty.SRU
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) 2015-07-23 Approve on 2015-08-17
Review via email: mp+265656@code.launchpad.net

This proposal has been superseded by a proposal from 2015-11-20.

Commit message

Rhythmbox: Use proper unity icons paths for preview image

To post a comment you must log in.
review: Approve
151. By Christopher Townsend on 2015-10-30

Add changes per Trevinho.

Unmerged revisions

151. By Christopher Townsend on 2015-10-30

Add changes per Trevinho.

150. By Marco Trevisan (Treviño) on 2015-07-23

Rhythmbox: Use proper unity icons paths for preview image

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-10-11 06:16:25 +0000
3+++ debian/changelog 2015-10-30 15:53:29 +0000
4@@ -1,3 +1,9 @@
5+unity-lens-music (6.9.0+13.10.20131011-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * Rhythmbox: Use proper unity icons paths for preview image (LP: #1338820)
8+
9+ -- Marco Trevisan (Treviño) <marco@ubuntu.com> Fri, 30 Oct 2015 16:46:30 +0100
10+
11 unity-lens-music (6.9.0+13.10.20131011-0ubuntu1) saucy; urgency=low
12
13 [ Michal Hruby ]
14
15=== modified file 'm4/gcov.m4'
16--- m4/gcov.m4 2013-02-15 13:06:28 +0000
17+++ m4/gcov.m4 2015-10-30 15:53:29 +0000
18@@ -30,7 +30,7 @@
19 AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
20 fi
21
22- lcov_version_list="1.6 1.7 1.8 1.9"
23+ lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11"
24 AC_CHECK_PROG(LCOV, lcov, lcov)
25 AC_CHECK_PROG(GENHTML, genhtml, genhtml)
26
27
28=== modified file 'src/rhythmbox-collection.vala'
29--- src/rhythmbox-collection.vala 2013-05-29 15:04:08 +0000
30+++ src/rhythmbox-collection.vala 2015-10-30 15:53:29 +0000
31@@ -23,7 +23,7 @@
32
33 namespace Unity.MusicLens
34 {
35- const string UNITY_ICON_PATH = Config.PKGDATADIR + "/6";
36+ const string UNITY_ICON_PATH = Config.PKGDATADIR + "/icons";
37 const string ALBUM_MISSING_ICON_PATH = UNITY_ICON_PATH + "/album_missing.png";
38 const string ALBUM_MISSING_PREVIEW_ICON_PATH = UNITY_ICON_PATH + "/album_missing_preview.png";
39

Subscribers

People subscribed via source and target branches