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

Proposed by Marco Trevisan (Treviño) on 2015-11-20
Status: Superseded
Proposed branch: lp:~townsend/unity-lens-music/fix-icon-path.trusty.SRU
Merge into: lp:~unity-team/unity-lens-music/trusty
Diff against target: 51 lines (+9/-3)
4 files modified
debian/changelog (+6/-0)
debian/control (+1/-1)
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) Approve on 2015-11-20
Review via email: mp+278119@code.launchpad.net

This proposal supersedes a proposal from 2015-07-23.

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.
Marco Trevisan (Treviño) (3v1n0) : Posted in a previous version of this proposal
review: Approve
review: Approve

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

149. By Timo Jyrinki on 2013-10-21

Update Vcs-Bzr to saucy

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-11-20 10:04:18 +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 'debian/control'
16--- debian/control 2013-06-20 13:23:29 +0000
17+++ debian/control 2015-11-20 10:04:18 +0000
18@@ -24,7 +24,7 @@
19 Homepage: https://launchpad.net/unity-lens-music
20 # If you aren't a member of ~unity-team but need to upload packaging changes,
21 # just go ahead. ~unity-team will notice and sync up the code again.
22-Vcs-Bzr: https://code.launchpad.net/~unity-team/unity-lens-music/trunk
23+Vcs-Bzr: https://code.launchpad.net/~unity-team/unity-lens-music/saucy
24
25 Package: unity-lens-music
26 Architecture: any
27
28=== modified file 'm4/gcov.m4'
29--- m4/gcov.m4 2013-02-15 13:06:28 +0000
30+++ m4/gcov.m4 2015-11-20 10:04:18 +0000
31@@ -30,7 +30,7 @@
32 AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
33 fi
34
35- lcov_version_list="1.6 1.7 1.8 1.9"
36+ lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11"
37 AC_CHECK_PROG(LCOV, lcov, lcov)
38 AC_CHECK_PROG(GENHTML, genhtml, genhtml)
39
40
41=== modified file 'src/rhythmbox-collection.vala'
42--- src/rhythmbox-collection.vala 2013-05-29 15:04:08 +0000
43+++ src/rhythmbox-collection.vala 2015-11-20 10:04:18 +0000
44@@ -23,7 +23,7 @@
45
46 namespace Unity.MusicLens
47 {
48- const string UNITY_ICON_PATH = Config.PKGDATADIR + "/6";
49+ const string UNITY_ICON_PATH = Config.PKGDATADIR + "/icons";
50 const string ALBUM_MISSING_ICON_PATH = UNITY_ICON_PATH + "/album_missing.png";
51 const string ALBUM_MISSING_PREVIEW_ICON_PATH = UNITY_ICON_PATH + "/album_missing_preview.png";
52

Subscribers

People subscribed via source and target branches