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

[Christopher Townsend]

Rhythmbox: Use proper unity icons paths for preview image

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

[lp:~townsend/unity-lens-music/fix-icon-path.trusty.SRU]

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

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-11 06:16:25 +0000
+++ debian/changelog	2015-10-30 15:53:29 +0000
@@ -1,3 +1,9 @@
+unity-lens-music (6.9.0+13.10.20131011-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Rhythmbox: Use proper unity icons paths for preview image (LP: #1338820)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Fri, 30 Oct 2015 16:46:30 +0100
+
 unity-lens-music (6.9.0+13.10.20131011-0ubuntu1) saucy; urgency=low
 
   [ Michal Hruby ]

=== modified file 'm4/gcov.m4'
--- m4/gcov.m4	2013-02-15 13:06:28 +0000
+++ m4/gcov.m4	2015-10-30 15:53:29 +0000
@@ -30,7 +30,7 @@
     AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
   fi
 
-  lcov_version_list="1.6 1.7 1.8 1.9"
+  lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11"
   AC_CHECK_PROG(LCOV, lcov, lcov)
   AC_CHECK_PROG(GENHTML, genhtml, genhtml)
 

=== modified file 'src/rhythmbox-collection.vala'
--- src/rhythmbox-collection.vala	2013-05-29 15:04:08 +0000
+++ src/rhythmbox-collection.vala	2015-10-30 15:53:29 +0000
@@ -23,7 +23,7 @@
 
 namespace Unity.MusicLens
 {
-    const string UNITY_ICON_PATH = Config.PKGDATADIR + "/6";
+    const string UNITY_ICON_PATH = Config.PKGDATADIR + "/icons";
     const string ALBUM_MISSING_ICON_PATH = UNITY_ICON_PATH + "/album_missing.png";
     const string ALBUM_MISSING_PREVIEW_ICON_PATH = UNITY_ICON_PATH + "/album_missing_preview.png";