[gnome-control-center/rename-app-icons: 2/2] icons: Rename app icons to match desktop file

[Felipe Borges <felipeborges src gnome org>]

commit 60a9c844737efa9703fee4c1a2d0460f7d3e8abc
Author: Felipe Borges <felipeborges gnome org>
Date:   Mon Feb 19 12:46:21 2018 +0100

    icons: Rename app icons to match desktop file
    
    The shell/gnome-control-center.desktop file defined the icon names
    to be "gnome-control-center".
    
    Fixes #2

 .../16x16/apps/gnome-control-center.png}           | Bin
 .../24x24/apps/gnome-control-center.png}           | Bin
 .../32x32/apps/gnome-control-center.png}           | Bin
 .../48x48/apps/gnome-control-center.png}           | Bin
 .../hicolor/512x512/apps/gnome-control-center.png  | Bin 0 -> 106995 bytes
 .../apps/gnome-control-center-symbolic.svg}        |   0
 .../hicolor_apps_512x512_gnome-control-center.png  | Bin 111227 -> 0 bytes
 data/icons/meson.build                             |  22 ++++-----------------
 data/icons/{ => src}/gnome-control-center-src.svg  |   0
 9 files changed, 4 insertions(+), 18 deletions(-)
---
diff --git a/data/icons/hicolor_apps_16x16_gnome-control-center.png 
b/data/icons/hicolor/16x16/apps/gnome-control-center.png
similarity index 100%
rename from data/icons/hicolor_apps_16x16_gnome-control-center.png
rename to data/icons/hicolor/16x16/apps/gnome-control-center.png
diff --git a/data/icons/hicolor_apps_24x24_gnome-control-center.png 
b/data/icons/hicolor/24x24/apps/gnome-control-center.png
similarity index 100%
rename from data/icons/hicolor_apps_24x24_gnome-control-center.png
rename to data/icons/hicolor/24x24/apps/gnome-control-center.png
diff --git a/data/icons/hicolor_apps_32x32_gnome-control-center.png 
b/data/icons/hicolor/32x32/apps/gnome-control-center.png
similarity index 100%
rename from data/icons/hicolor_apps_32x32_gnome-control-center.png
rename to data/icons/hicolor/32x32/apps/gnome-control-center.png
diff --git a/data/icons/hicolor_apps_48x48_gnome-control-center.png 
b/data/icons/hicolor/48x48/apps/gnome-control-center.png
similarity index 100%
rename from data/icons/hicolor_apps_48x48_gnome-control-center.png
rename to data/icons/hicolor/48x48/apps/gnome-control-center.png
diff --git a/data/icons/hicolor/512x512/apps/gnome-control-center.png 
b/data/icons/hicolor/512x512/apps/gnome-control-center.png
new file mode 100644
index 000000000..efb14df0b
Binary files /dev/null and b/data/icons/hicolor/512x512/apps/gnome-control-center.png differ
diff --git a/data/icons/hicolor_apps_symbolic_gnome-control-center-symbolic.svg 
b/data/icons/hicolor/symbolic/apps/gnome-control-center-symbolic.svg
similarity index 100%
rename from data/icons/hicolor_apps_symbolic_gnome-control-center-symbolic.svg
rename to data/icons/hicolor/symbolic/apps/gnome-control-center-symbolic.svg
diff --git a/data/icons/meson.build b/data/icons/meson.build
index 56fa96791..769e8b7d1 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1,19 +1,5 @@
-icon_sizes = [
-  '16x16',
-  '24x24',
-  '32x32',
-  '48x48',
-  '512x512'
-]
-
-foreach icon_size: icon_sizes
-  install_data(
-    '_'.join(['hicolor', 'apps', icon_size, 'gnome-control-center.png']),
-    install_dir: join_paths(control_center_icondir, 'hicolor', icon_size, 'apps')
-  )
-endforeach
-
-install_data(
-  'hicolor_apps_symbolic_gnome-control-center-symbolic.svg',
-  install_dir: join_paths(control_center_icondir, 'hicolor', 'symbolic', 'apps')
+install_subdir(
+  'hicolor',
+  install_dir: control_center_icondir
 )
+
diff --git a/data/icons/gnome-control-center-src.svg b/data/icons/src/gnome-control-center-src.svg
similarity index 100%
rename from data/icons/gnome-control-center-src.svg
rename to data/icons/src/gnome-control-center-src.svg