Suru is Yaru for ubuntu - but don't install icon by default.

ChangeLog

@@ -20,6 +20,8 @@
     drive.
 14. If a dynamic playlist has rating 0..5 stars, then include all songs (even
     those without an explicit rating).
+15. Ubuntu icon theme is now named Yaru, so install there.
+16. Don't install Yaru icon by default.
 
 2.3.1
 -----

INSTALL

@@ -61,8 +61,9 @@ The following options may be passed to CMake:
         Build UDisks2 backend for solid-lite.
         Default: ON
 
-    -DINSTALL_UBUNTU_ICONS=<ON if Ubuntu, OFF otherwise>
-        Install Suru icons for Ubuntu.
+    -DINSTALL_UBUNTU_ICONS=ON
+        Install Yaru icons for Ubuntu.
+        Default: OFF
 
     -DCANTATA_HELPERS_LIB_DIR=<subdir>
         For 64 bit builds, this may be used to control the lib sub-dir

icons/CMakeLists.txt

@@ -19,21 +19,21 @@ if (NOT HAIKU AND NOT WIN32 AND NOT APPLE)
            endforeach()
     update_iconcache(hicolor)
 
-    if (EXISTS /etc/lsb-release)
-        file(READ "/etc/lsb-release" LSB_RELEASE_CONTENTS)
-        string(REGEX MATCH "DISTRIB_ID=Ubuntu" IS_UBUNTU ${LSB_RELEASE_CONTENTS})
-        if (IS_UBUNTU)
-            set(INSTALL_UBUNTU_ICONS_DEFAULT ON)
-        else(IS_UBUNTU)
-            set(INSTALL_UBUNTU_ICONS_DEFAULT OFF)
-        endif(IS_UBUNTU)
-    else(EXISTS /etc/lsb-release)
+    #if (EXISTS /etc/lsb-release)
+    #    file(READ "/etc/lsb-release" LSB_RELEASE_CONTENTS)
+    #    string(REGEX MATCH "DISTRIB_ID=Ubuntu" IS_UBUNTU ${LSB_RELEASE_CONTENTS})
+    #	if (IS_UBUNTU)
+    #        set(INSTALL_UBUNTU_ICONS_DEFAULT ON)
+    #    else(IS_UBUNTU)
+    #        set(INSTALL_UBUNTU_ICONS_DEFAULT OFF)
+    #    endif(IS_UBUNTU)
+    #else(EXISTS /etc/lsb-release)
         set(INSTALL_UBUNTU_ICONS_DEFAULT OFF)
-    endif(EXISTS /etc/lsb-release)
-    option(INSTALL_UBUNTU_ICONS "Install the Ubuntu Suru icons" ${INSTALL_UBUNTU_ICONS_DEFAULT})
+    #endif(EXISTS /etc/lsb-release)
+    option(INSTALL_UBUNTU_ICONS "Install the Ubuntu Yaru icons" ${INSTALL_UBUNTU_ICONS_DEFAULT})
 
     if (INSTALL_UBUNTU_ICONS)
-        add_subdirectory(suru)
-        update_iconcache(Suru)
+        add_subdirectory(yaru)
+        update_iconcache(Yaru)
     endif ()
 endif ()

icons/suru/CMakeLists.txt → icons/yaru/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(CANTATA_SURU_ICON_INSTALL_PREFIX ${SHARE_INSTALL_PREFIX}/icons/Suru)
+set(CANTATA_SURU_ICON_INSTALL_PREFIX ${SHARE_INSTALL_PREFIX}/icons/Yaru)
 install(FILES ../cantata-symbolic.svg DESTINATION ${CANTATA_SURU_ICON_INSTALL_PREFIX}/scalable/apps)
 
 foreach (SIZE 16 24 32 48 256)