[gnome-software] Move hicolor icons to a subdirectory

[Kalev Lember <klember src gnome org>]

commit 6bcf6c5e4ec68dabc29256fb4dde694b2dcf5c0f
Author: Kalev Lember <kalevlember gmail com>
Date:   Wed Aug 6 18:27:03 2014 +0200

    Move hicolor icons to a subdirectory

 configure.ac                                       |   15 ++++++++-------
 data/icons/Makefile.am                             |    8 +-------
 data/icons/{ => hicolor}/16x16/Makefile.am         |    0
 data/icons/{ => hicolor}/16x16/gnome-software.png  |  Bin 705 -> 705 bytes
 data/icons/{ => hicolor}/22x22/Makefile.am         |    0
 data/icons/{ => hicolor}/22x22/gnome-software.png  |  Bin 1062 -> 1062 bytes
 data/icons/{ => hicolor}/24x24/Makefile.am         |    0
 data/icons/{ => hicolor}/24x24/gnome-software.png  |  Bin 1063 -> 1063 bytes
 data/icons/{ => hicolor}/256x256/Makefile.am       |    0
 .../icons/{ => hicolor}/256x256/gnome-software.png |  Bin 25274 -> 25274 bytes
 data/icons/{ => hicolor}/32x32/Makefile.am         |    0
 data/icons/{ => hicolor}/32x32/gnome-software.png  |  Bin 1613 -> 1613 bytes
 data/icons/{ => hicolor}/48x48/Makefile.am         |    0
 data/icons/{ => hicolor}/48x48/gnome-software.png  |  Bin 2538 -> 2538 bytes
 data/icons/hicolor/Makefile.am                     |   10 ++++++++++
 data/icons/{ => hicolor}/gnome-software.svg        |    0
 data/icons/{ => hicolor}/scalable/Makefile.am      |    0
 .../scalable/gnome-software-symbolic.svg           |    0
 18 files changed, 19 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 713a07e..43dab79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,13 +106,14 @@ data/featured.ini
 data/Makefile
 data/modulesets/Makefile
 data/icons/Makefile
-data/icons/16x16/Makefile
-data/icons/22x22/Makefile
-data/icons/24x24/Makefile
-data/icons/32x32/Makefile
-data/icons/48x48/Makefile
-data/icons/256x256/Makefile
-data/icons/scalable/Makefile
+data/icons/hicolor/Makefile
+data/icons/hicolor/16x16/Makefile
+data/icons/hicolor/22x22/Makefile
+data/icons/hicolor/24x24/Makefile
+data/icons/hicolor/32x32/Makefile
+data/icons/hicolor/48x48/Makefile
+data/icons/hicolor/256x256/Makefile
+data/icons/hicolor/scalable/Makefile
 src/Makefile
 src/plugins/Makefile
 tests/Makefile
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index ee705f5..01e9346 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,10 +1,4 @@
 SUBDIRS =                                              \
-       16x16                                           \
-       22x22                                           \
-       24x24                                           \
-       32x32                                           \
-       48x48                                           \
-       256x256                                         \
-       scalable
+       hicolor
 
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/16x16/Makefile.am b/data/icons/hicolor/16x16/Makefile.am
similarity index 100%
rename from data/icons/16x16/Makefile.am
rename to data/icons/hicolor/16x16/Makefile.am
diff --git a/data/icons/22x22/Makefile.am b/data/icons/hicolor/22x22/Makefile.am
similarity index 100%
rename from data/icons/22x22/Makefile.am
rename to data/icons/hicolor/22x22/Makefile.am
diff --git a/data/icons/24x24/Makefile.am b/data/icons/hicolor/24x24/Makefile.am
similarity index 100%
rename from data/icons/24x24/Makefile.am
rename to data/icons/hicolor/24x24/Makefile.am
diff --git a/data/icons/256x256/Makefile.am b/data/icons/hicolor/256x256/Makefile.am
similarity index 100%
rename from data/icons/256x256/Makefile.am
rename to data/icons/hicolor/256x256/Makefile.am
diff --git a/data/icons/32x32/Makefile.am b/data/icons/hicolor/32x32/Makefile.am
similarity index 100%
rename from data/icons/32x32/Makefile.am
rename to data/icons/hicolor/32x32/Makefile.am
diff --git a/data/icons/48x48/Makefile.am b/data/icons/hicolor/48x48/Makefile.am
similarity index 100%
rename from data/icons/48x48/Makefile.am
rename to data/icons/hicolor/48x48/Makefile.am
diff --git a/data/icons/hicolor/Makefile.am b/data/icons/hicolor/Makefile.am
new file mode 100644
index 0000000..ee705f5
--- /dev/null
+++ b/data/icons/hicolor/Makefile.am
@@ -0,0 +1,10 @@
+SUBDIRS =                                              \
+       16x16                                           \
+       22x22                                           \
+       24x24                                           \
+       32x32                                           \
+       48x48                                           \
+       256x256                                         \
+       scalable
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/gnome-software.svg b/data/icons/hicolor/gnome-software.svg
similarity index 100%
rename from data/icons/gnome-software.svg
rename to data/icons/hicolor/gnome-software.svg
diff --git a/data/icons/scalable/Makefile.am b/data/icons/hicolor/scalable/Makefile.am
similarity index 100%
rename from data/icons/scalable/Makefile.am
rename to data/icons/hicolor/scalable/Makefile.am
diff --git a/data/icons/scalable/gnome-software-symbolic.svg 
b/data/icons/hicolor/scalable/gnome-software-symbolic.svg
similarity index 100%
rename from data/icons/scalable/gnome-software-symbolic.svg
rename to data/icons/hicolor/scalable/gnome-software-symbolic.svg