[gnome-games] build: Only install the icons for games that are built

From: Christian Persch <chpe src gnome org>
To: svn-commits-list gnome org
Subject: [gnome-games] build: Only install the icons for games that are built
Date: Fri, 10 Jul 2009 21:55:15 +0000 (UTC)
commit 1226d195ac54d503032f3668bea9e66e37a8b9fd
Author: Christian Persch <chpe gnome org>
Date:   Fri Jul 10 23:43:33 2009 +0200

    build: Only install the icons for games that are built
    
    Move the public icons from icons/ subdirectories to the main icons/
    directory, using the same naming scheme the private icons already use.
    Copy the private icons install rule for the public icons.
    Bug #439875.

 icons/Makefile.am                                  |  441 +++++++++++---------
 ....png => hicolor_apps_16x16_gnome-aisleriot.png} |  Bin 699 -> 699 bytes
 ....png => hicolor_apps_16x16_gnome-blackjack.png} |  Bin 855 -> 855 bytes
 ...l.png => hicolor_apps_16x16_gnome-freecell.png} |  Bin 436 -> 436 bytes
 ...ss.png => hicolor_apps_16x16_gnome-glchess.png} |  Bin 568 -> 568 bytes
 ...nes.png => hicolor_apps_16x16_gnome-glines.png} |  Bin 675 -> 675 bytes
 ...nect.png => hicolor_apps_16x16_gnome-gnect.png} |  Bin 562 -> 562 bytes
 ...s.png => hicolor_apps_16x16_gnome-gnibbles.png} |  Bin 749 -> 749 bytes
 ....png => hicolor_apps_16x16_gnome-gnometris.png} |  Bin 649 -> 649 bytes
 ...agno.png => hicolor_apps_16x16_gnome-iagno.png} |  Bin 856 -> 856 bytes
 ...ki.png => hicolor_apps_16x16_gnome-klotski.png} |  Bin 554 -> 554 bytes
 ...g.png => hicolor_apps_16x16_gnome-mahjongg.png} |  Bin 598 -> 598 bytes
 ...ines.png => hicolor_apps_16x16_gnome-mines.png} |  Bin 736 -> 736 bytes
 ...ots.png => hicolor_apps_16x16_gnome-robots.png} |  Bin 864 -> 864 bytes
 ....png => hicolor_apps_16x16_gnome-samegnome.png} |  Bin 876 -> 876 bytes
 ...oku.png => hicolor_apps_16x16_gnome-sudoku.png} |  Bin 490 -> 490 bytes
 ...-tali.png => hicolor_apps_16x16_gnome-tali.png} |  Bin 641 -> 641 bytes
 ...x.png => hicolor_apps_16x16_gnome-tetravex.png} |  Bin 838 -> 838 bytes
 ....png => hicolor_apps_22x22_gnome-aisleriot.png} |  Bin 1153 -> 1153 bytes
 ....png => hicolor_apps_22x22_gnome-blackjack.png} |  Bin 1204 -> 1204 bytes
 ...l.png => hicolor_apps_22x22_gnome-freecell.png} |  Bin 1179 -> 1179 bytes
 ...ss.png => hicolor_apps_22x22_gnome-glchess.png} |  Bin 986 -> 986 bytes
 ...nes.png => hicolor_apps_22x22_gnome-glines.png} |  Bin 1161 -> 1161 bytes
 ...nect.png => hicolor_apps_22x22_gnome-gnect.png} |  Bin 1033 -> 1033 bytes
 ...s.png => hicolor_apps_22x22_gnome-gnibbles.png} |  Bin 1138 -> 1138 bytes
 ....png => hicolor_apps_22x22_gnome-gnometris.png} |  Bin 1110 -> 1110 bytes
 ...agno.png => hicolor_apps_22x22_gnome-iagno.png} |  Bin 985 -> 985 bytes
 ...ki.png => hicolor_apps_22x22_gnome-klotski.png} |  Bin 909 -> 909 bytes
 ...g.png => hicolor_apps_22x22_gnome-mahjongg.png} |  Bin 1037 -> 1037 bytes
 ...ines.png => hicolor_apps_22x22_gnome-mines.png} |  Bin 1281 -> 1281 bytes
 ...ots.png => hicolor_apps_22x22_gnome-robots.png} |  Bin 1330 -> 1330 bytes
 ....png => hicolor_apps_22x22_gnome-samegnome.png} |  Bin 1031 -> 1031 bytes
 ...oku.png => hicolor_apps_22x22_gnome-sudoku.png} |  Bin 1137 -> 1137 bytes
 ...-tali.png => hicolor_apps_22x22_gnome-tali.png} |  Bin 1381 -> 1381 bytes
 ...x.png => hicolor_apps_22x22_gnome-tetravex.png} |  Bin 1523 -> 1523 bytes
 ....png => hicolor_apps_24x24_gnome-aisleriot.png} |  Bin 1193 -> 1193 bytes
 ....png => hicolor_apps_24x24_gnome-blackjack.png} |  Bin 1257 -> 1257 bytes
 ...l.png => hicolor_apps_24x24_gnome-freecell.png} |  Bin 1229 -> 1229 bytes
 ...ss.png => hicolor_apps_24x24_gnome-glchess.png} |  Bin 1027 -> 1027 bytes
 ...nes.png => hicolor_apps_24x24_gnome-glines.png} |  Bin 1228 -> 1228 bytes
 ...nect.png => hicolor_apps_24x24_gnome-gnect.png} |  Bin 1066 -> 1066 bytes
 ...s.png => hicolor_apps_24x24_gnome-gnibbles.png} |  Bin 1181 -> 1181 bytes
 ....png => hicolor_apps_24x24_gnome-gnometris.png} |  Bin 1146 -> 1146 bytes
 ...agno.png => hicolor_apps_24x24_gnome-iagno.png} |  Bin 1044 -> 1044 bytes
 ...ki.png => hicolor_apps_24x24_gnome-klotski.png} |  Bin 885 -> 885 bytes
 ...g.png => hicolor_apps_24x24_gnome-mahjongg.png} |  Bin 1070 -> 1070 bytes
 ...ines.png => hicolor_apps_24x24_gnome-mines.png} |  Bin 1325 -> 1325 bytes
 ...ots.png => hicolor_apps_24x24_gnome-robots.png} |  Bin 1358 -> 1358 bytes
 ....png => hicolor_apps_24x24_gnome-samegnome.png} |  Bin 1071 -> 1071 bytes
 ...oku.png => hicolor_apps_24x24_gnome-sudoku.png} |  Bin 1162 -> 1162 bytes
 ...-tali.png => hicolor_apps_24x24_gnome-tali.png} |  Bin 1452 -> 1452 bytes
 ...x.png => hicolor_apps_24x24_gnome-tetravex.png} |  Bin 1578 -> 1578 bytes
 ....png => hicolor_apps_26x26_gnome-aisleriot.png} |  Bin 1238 -> 1238 bytes
 ....png => hicolor_apps_32x32_gnome-aisleriot.png} |  Bin 1422 -> 1422 bytes
 ....png => hicolor_apps_32x32_gnome-blackjack.png} |  Bin 1774 -> 1774 bytes
 ...l.png => hicolor_apps_32x32_gnome-freecell.png} |  Bin 1772 -> 1772 bytes
 ...ss.png => hicolor_apps_32x32_gnome-glchess.png} |  Bin 1354 -> 1354 bytes
 ...nes.png => hicolor_apps_32x32_gnome-glines.png} |  Bin 1908 -> 1908 bytes
 ...nect.png => hicolor_apps_32x32_gnome-gnect.png} |  Bin 2011 -> 2011 bytes
 ...s.png => hicolor_apps_32x32_gnome-gnibbles.png} |  Bin 2101 -> 2101 bytes
 ....png => hicolor_apps_32x32_gnome-gnometris.png} |  Bin 1429 -> 1429 bytes
 ...agno.png => hicolor_apps_32x32_gnome-iagno.png} |  Bin 2501 -> 2501 bytes
 ...ki.png => hicolor_apps_32x32_gnome-klotski.png} |  Bin 1440 -> 1440 bytes
 ...g.png => hicolor_apps_32x32_gnome-mahjongg.png} |  Bin 1799 -> 1799 bytes
 ...ines.png => hicolor_apps_32x32_gnome-mines.png} |  Bin 2158 -> 2158 bytes
 ...ots.png => hicolor_apps_32x32_gnome-robots.png} |  Bin 2071 -> 2071 bytes
 ....png => hicolor_apps_32x32_gnome-samegnome.png} |  Bin 2218 -> 2218 bytes
 ...oku.png => hicolor_apps_32x32_gnome-sudoku.png} |  Bin 1709 -> 1709 bytes
 ...-tali.png => hicolor_apps_32x32_gnome-tali.png} |  Bin 2431 -> 2431 bytes
 ...x.png => hicolor_apps_32x32_gnome-tetravex.png} |  Bin 2993 -> 2993 bytes
 ....png => hicolor_apps_34x34_gnome-aisleriot.png} |  Bin 1458 -> 1458 bytes
 ....png => hicolor_apps_40x40_gnome-aisleriot.png} |  Bin 2092 -> 2092 bytes
 ....png => hicolor_apps_48x48_gnome-aisleriot.png} |  Bin 2701 -> 2701 bytes
 ....png => hicolor_apps_48x48_gnome-blackjack.png} |  Bin 3556 -> 3556 bytes
 ...l.png => hicolor_apps_48x48_gnome-freecell.png} |  Bin 3108 -> 3108 bytes
 ...ss.png => hicolor_apps_48x48_gnome-glchess.png} |  Bin 2177 -> 2177 bytes
 ...nes.png => hicolor_apps_48x48_gnome-glines.png} |  Bin 3326 -> 3326 bytes
 ...nect.png => hicolor_apps_48x48_gnome-gnect.png} |  Bin 2968 -> 2968 bytes
 ...s.png => hicolor_apps_48x48_gnome-gnibbles.png} |  Bin 3452 -> 3452 bytes
 ....png => hicolor_apps_48x48_gnome-gnometris.png} |  Bin 2094 -> 2094 bytes
 ...agno.png => hicolor_apps_48x48_gnome-iagno.png} |  Bin 3465 -> 3465 bytes
 ...ki.png => hicolor_apps_48x48_gnome-klotski.png} |  Bin 2252 -> 2252 bytes
 ...g.png => hicolor_apps_48x48_gnome-mahjongg.png} |  Bin 2268 -> 2268 bytes
 ...ines.png => hicolor_apps_48x48_gnome-mines.png} |  Bin 3398 -> 3398 bytes
 ...ots.png => hicolor_apps_48x48_gnome-robots.png} |  Bin 3129 -> 3129 bytes
 ....png => hicolor_apps_48x48_gnome-samegnome.png} |  Bin 2774 -> 2774 bytes
 ...oku.png => hicolor_apps_48x48_gnome-sudoku.png} |  Bin 3891 -> 3891 bytes
 ...-tali.png => hicolor_apps_48x48_gnome-tali.png} |  Bin 3406 -> 3406 bytes
 ...x.png => hicolor_apps_48x48_gnome-tetravex.png} |  Bin 4941 -> 4941 bytes
 ....png => hicolor_apps_50x50_gnome-aisleriot.png} |  Bin 2707 -> 2707 bytes
 ...g => hicolor_apps_scalable_gnome-aisleriot.png} |  Bin 3757 -> 3757 bytes
 ...g => hicolor_apps_scalable_gnome-aisleriot.svg} |    0
 ...g => hicolor_apps_scalable_gnome-blackjack.svg} |    0
 ...vg => hicolor_apps_scalable_gnome-freecell.svg} |    0
 ...svg => hicolor_apps_scalable_gnome-glchess.svg} |    0
 ....svg => hicolor_apps_scalable_gnome-glines.svg} |    0
 ...t.svg => hicolor_apps_scalable_gnome-gnect.svg} |    0
 ...vg => hicolor_apps_scalable_gnome-gnibbles.svg} |    0
 ...g => hicolor_apps_scalable_gnome-gnometris.svg} |    0
 ...o.svg => hicolor_apps_scalable_gnome-iagno.svg} |    0
 ...svg => hicolor_apps_scalable_gnome-klotski.svg} |    0
 ...g => hicolor_apps_scalable_gnome-lightsoff.svg} |    0
 ...vg => hicolor_apps_scalable_gnome-mahjongg.svg} |    0
 ...s.svg => hicolor_apps_scalable_gnome-mines.svg} |    0
 ....svg => hicolor_apps_scalable_gnome-robots.svg} |    0
 ...g => hicolor_apps_scalable_gnome-samegnome.svg} |    0
 ....svg => hicolor_apps_scalable_gnome-sudoku.svg} |    0
 ...li.svg => hicolor_apps_scalable_gnome-tali.svg} |    0
 ...vg => hicolor_apps_scalable_gnome-tetravex.svg} |    0
 109 files changed, 251 insertions(+), 190 deletions(-)
---
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 65377fd..70775da 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,145 +1,217 @@
 NULL =
 
-icons_16 = \
-	16x16/gnome-aisleriot.png \
-	16x16/gnome-blackjack.png \
-	16x16/gnome-freecell.png \
-	16x16/gnome-glchess.png \
-	16x16/gnome-glines.png \
-	16x16/gnome-gnect.png \
-	16x16/gnome-gnibbles.png \
-	16x16/gnome-gnometris.png \
-	16x16/gnome-iagno.png \
-	16x16/gnome-klotski.png \
-	16x16/gnome-mahjongg.png \
-	16x16/gnome-mines.png \
-	16x16/gnome-robots.png \
-	16x16/gnome-samegnome.png \
-	16x16/gnome-sudoku.png \
-	16x16/gnome-tali.png \
-	16x16/gnome-tetravex.png \
-	$(NULL)
-
-icons_22 = \
-	22x22/gnome-aisleriot.png \
-	22x22/gnome-blackjack.png \
-	22x22/gnome-freecell.png \
-	22x22/gnome-glchess.png \
-	22x22/gnome-glines.png \
-	22x22/gnome-gnect.png \
-	22x22/gnome-gnibbles.png \
-	22x22/gnome-gnometris.png \
-	22x22/gnome-iagno.png \
-	22x22/gnome-klotski.png \
-	22x22/gnome-mahjongg.png \
-	22x22/gnome-mines.png \
-	22x22/gnome-robots.png \
-	22x22/gnome-samegnome.png \
-	22x22/gnome-sudoku.png \
-	22x22/gnome-tali.png \
-	22x22/gnome-tetravex.png \
-	$(NULL)
-
-icons_24 = \
-	24x24/gnome-aisleriot.png \
-	24x24/gnome-blackjack.png \
-	24x24/gnome-freecell.png \
-	24x24/gnome-glchess.png \
-	24x24/gnome-glines.png \
-	24x24/gnome-gnect.png \
-	24x24/gnome-gnibbles.png \
-	24x24/gnome-gnometris.png \
-	24x24/gnome-iagno.png \
-	24x24/gnome-klotski.png \
-	24x24/gnome-mahjongg.png \
-	24x24/gnome-mines.png \
-	24x24/gnome-robots.png \
-	24x24/gnome-samegnome.png \
-	24x24/gnome-sudoku.png \
-	24x24/gnome-tali.png \
-	24x24/gnome-tetravex.png \
-	$(NULL)
-
-icons_26 = \
-	26x26/gnome-aisleriot.png \
-	$(NULL)
-
-icons_32 = \
-	32x32/gnome-aisleriot.png \
-	32x32/gnome-blackjack.png \
-	32x32/gnome-freecell.png \
-	32x32/gnome-glchess.png \
-	32x32/gnome-glines.png \
-	32x32/gnome-gnect.png \
-	32x32/gnome-gnibbles.png \
-	32x32/gnome-gnometris.png \
-	32x32/gnome-iagno.png \
-	32x32/gnome-klotski.png \
-	32x32/gnome-mahjongg.png \
-	32x32/gnome-mines.png \
-	32x32/gnome-robots.png \
-	32x32/gnome-samegnome.png \
-	32x32/gnome-sudoku.png \
-	32x32/gnome-tali.png \
-	32x32/gnome-tetravex.png \
-	$(NULL)
-
-icons_34 = \
-	34x34/gnome-aisleriot.png \
-	$(NULL)
-
-icons_40 = \
-	40x40/gnome-aisleriot.png \
-	$(NULL)
-
-icons_48 = \
-	48x48/gnome-aisleriot.png \
-	48x48/gnome-blackjack.png \
-	48x48/gnome-freecell.png \
-	48x48/gnome-glchess.png \
-	48x48/gnome-glines.png \
-	48x48/gnome-gnect.png \
-	48x48/gnome-gnibbles.png \
-	48x48/gnome-gnometris.png \
-	48x48/gnome-iagno.png \
-	48x48/gnome-klotski.png \
-	48x48/gnome-mahjongg.png \
-	48x48/gnome-mines.png \
-	48x48/gnome-robots.png \
-	48x48/gnome-samegnome.png \
-	48x48/gnome-sudoku.png \
-	48x48/gnome-tali.png \
-	48x48/gnome-tetravex.png \
-	$(NULL)
-
-icons_50 = \
-	50x50/gnome-aisleriot.png \
-	$(NULL)
-
-icons_64_54 = \
-	64x54/gnome-aisleriot.png \
-	$(NULL)
-
-icons_svg = \
-	scalable/gnome-aisleriot.svg \
-	scalable/gnome-blackjack.svg \
-	scalable/gnome-freecell.svg \
-	scalable/gnome-glchess.svg \
-	scalable/gnome-glines.svg \
-	scalable/gnome-gnect.svg \
-	scalable/gnome-gnibbles.svg \
-	scalable/gnome-gnometris.svg \
-	scalable/gnome-iagno.svg \
-	scalable/gnome-klotski.svg \
-	scalable/gnome-mahjongg.svg \
-	scalable/gnome-mines.svg \
-	scalable/gnome-robots.svg \
-	scalable/gnome-samegnome.svg \
-	scalable/gnome-sudoku.svg \
-	scalable/gnome-tali.svg \
-	scalable/gnome-tetravex.svg \
-	scalable/gnome-lightsoff.svg \
+public_icons_themes = hicolor
+
+dist_noinst_DATA =
+
+if BUILD_AISLERIOT
+dist_noinst_DATA += \
+	hicolor_apps_16x16_gnome-aisleriot.png \
+	$(NULL)
+
+if HAVE_HILDON
+
+# These sizes work for maemo3 at least. The "scalable" icon really
+# is a 64x54 icon, which is the size that apparently is required for
+# the app menu on maemo3.
+#
+# FIXME: check which sizes are required on maemo4 and maemo5
+
+dist_noinst_DATA += \
+	hicolor_apps_34x34_gnome-aisleriot.png \
+	hicolor_apps_26x26_gnome-aisleriot.png \
+	hicolor_apps_40x40_gnome-aisleriot.png \
+	hicolor_apps_50x50_gnome-aisleriot.png \
+	hicolor_apps_scalable_gnome-aisleriot.png \
+	$(NULL)
+else
+dist_noinst_DATA += \
+	hicolor_apps_22x22_gnome-aisleriot.png \
+	hicolor_apps_24x24_gnome-aisleriot.png \
+	hicolor_apps_32x32_gnome-aisleriot.png \
+	hicolor_apps_48x48_gnome-aisleriot.png \
+	hicolor_apps_scalable_gnome-aisleriot.svg \
+	hicolor_apps_16x16_gnome-freecell.png \
+	hicolor_apps_22x22_gnome-freecell.png \
+	hicolor_apps_24x24_gnome-freecell.png \
+	hicolor_apps_32x32_gnome-freecell.png \
+	hicolor_apps_48x48_gnome-freecell.png \
+	hicolor_apps_scalable_gnome-freecell.svg \
 	$(NULL)
+endif # HAVE_HILDON
+
+endif # BUILD_AISLERIOT
+
+if BUILD_BLACKJACK
+dist_noinst_DATA += \
+	hicolor_apps_16x16_gnome-blackjack.png \
+	hicolor_apps_22x22_gnome-blackjack.png \
+	hicolor_apps_24x24_gnome-blackjack.png \
+	hicolor_apps_32x32_gnome-blackjack.png \
+	hicolor_apps_48x48_gnome-blackjack.png \
+	hicolor_apps_scalable_gnome-blackjack.svg \
+	$(NULL)
+endif
+
+if BUILD_GLCHESS
+dist_noinst_DATA += \
+	hicolor_apps_16x16_gnome-glchess.png \
+	hicolor_apps_22x22_gnome-glchess.png \
+	hicolor_apps_24x24_gnome-glchess.png \
+	hicolor_apps_32x32_gnome-glchess.png \
+	hicolor_apps_48x48_gnome-glchess.png \
+	hicolor_apps_scalable_gnome-glchess.svg \
+	$(NULL)
+endif
+
+if BUILD_GLINES
+dist_noinst_DATA += \
+	hicolor_apps_16x16_gnome-glines.png \
+	hicolor_apps_22x22_gnome-glines.png \
+	hicolor_apps_24x24_gnome-glines.png \
+	hicolor_apps_32x32_gnome-glines.png \
+	hicolor_apps_48x48_gnome-glines.png \
+	hicolor_apps_scalable_gnome-glines.svg \
+	$(NULL)
+endif
+
+if BUILD_GNECT
+dist_noinst_DATA += \
+	hicolor_apps_16x16_gnome-gnect.png \
+	hicolor_apps_22x22_gnome-gnect.png \
+	hicolor_apps_24x24_gnome-gnect.png \
+	hicolor_apps_32x32_gnome-gnect.png \
+	hicolor_apps_48x48_gnome-gnect.png \
+	hicolor_apps_scalable_gnome-gnect.svg \
+	$(NULL)
+endif
+
+if BUILD_GNIBBLES
+dist_noinst_DATA += \
+	hicolor_apps_16x16_gnome-gnibbles.png \
+	hicolor_apps_22x22_gnome-gnibbles.png \
+	hicolor_apps_24x24_gnome-gnibbles.png \
+	hicolor_apps_32x32_gnome-gnibbles.png \
+	hicolor_apps_48x48_gnome-gnibbles.png \
+	hicolor_apps_scalable_gnome-gnibbles.svg \
+	$(NULL)
+endif
+
+if BUILD_GNOBOTS2
+dist_noinst_DATA += \
+	hicolor_apps_16x16_gnome-robots.png \
+	hicolor_apps_22x22_gnome-robots.png \
+	hicolor_apps_24x24_gnome-robots.png \
+	hicolor_apps_32x32_gnome-robots.png \
+	hicolor_apps_48x48_gnome-robots.png \
+	hicolor_apps_scalable_gnome-robots.svg \
+	$(NULL)
+endif
+
+if BUILD_GNOME_SUDOKU
+dist_noinst_DATA += \
+	hicolor_apps_16x16_gnome-sudoku.png \
+	hicolor_apps_22x22_gnome-sudoku.png \
+	hicolor_apps_24x24_gnome-sudoku.png \
+	hicolor_apps_32x32_gnome-sudoku.png \
+	hicolor_apps_48x48_gnome-sudoku.png \
+	hicolor_apps_scalable_gnome-sudoku.svg \
+	$(NULL)
+endif
+
+if BUILD_GNOMETRIS
+dist_noinst_DATA += \
+	hicolor_apps_16x16_gnome-gnometris.png \
+	hicolor_apps_22x22_gnome-gnometris.png \
+	hicolor_apps_24x24_gnome-gnometris.png \
+	hicolor_apps_32x32_gnome-gnometris.png \
+	hicolor_apps_48x48_gnome-gnometris.png \
+	hicolor_apps_scalable_gnome-gnometris.svg \
+	$(NULL)
+endif
+
+if BUILD_GNOMINE
+dist_noinst_DATA += \
+	hicolor_apps_16x16_gnome-mines.png \
+	hicolor_apps_22x22_gnome-mines.png \
+	hicolor_apps_24x24_gnome-mines.png \
+	hicolor_apps_32x32_gnome-mines.png \
+	hicolor_apps_48x48_gnome-mines.png \
+	hicolor_apps_scalable_gnome-mines.svg \
+	$(NULL)
+endif
+
+if BUILD_GNOTRAVEX
+dist_noinst_DATA += \
+	hicolor_apps_16x16_gnome-tetravex.png \
+	hicolor_apps_22x22_gnome-tetravex.png \
+	hicolor_apps_24x24_gnome-tetravex.png \
+	hicolor_apps_32x32_gnome-tetravex.png \
+	hicolor_apps_48x48_gnome-tetravex.png \
+	hicolor_apps_scalable_gnome-tetravex.svg \
+	$(NULL)
+endif
+
+if BUILD_GNOTSKI
+dist_noinst_DATA += \
+	hicolor_apps_16x16_gnome-klotski.png \
+	hicolor_apps_22x22_gnome-klotski.png \
+	hicolor_apps_24x24_gnome-klotski.png \
+	hicolor_apps_32x32_gnome-klotski.png \
+	hicolor_apps_48x48_gnome-klotski.png \
+	hicolor_apps_scalable_gnome-klotski.svg \
+	$(NULL)
+endif
+
+if BUILD_GTALI
+dist_noinst_DATA += \
+	hicolor_apps_16x16_gnome-tali.png \
+	hicolor_apps_22x22_gnome-tali.png \
+	hicolor_apps_24x24_gnome-tali.png \
+	hicolor_apps_32x32_gnome-tali.png \
+	hicolor_apps_48x48_gnome-tali.png \
+	hicolor_apps_scalable_gnome-tali.svg \
+	$(NULL)
+endif
+
+if BUILD_IAGNO
+dist_noinst_DATA += \
+	hicolor_apps_16x16_gnome-iagno.png \
+	hicolor_apps_22x22_gnome-iagno.png \
+	hicolor_apps_24x24_gnome-iagno.png \
+	hicolor_apps_32x32_gnome-iagno.png \
+	hicolor_apps_48x48_gnome-iagno.png \
+	hicolor_apps_scalable_gnome-iagno.svg \
+	$(NULL)
+endif
+
+if BUILD_LIGHTSOFF
+dist_noinst_DATA += \
+	hicolor_apps_scalable_gnome-lightsoff.svg \
+	$(NULL)
+endif
+
+if BUILD_MAHJONGG
+dist_noinst_DATA += \
+	hicolor_apps_16x16_gnome-mahjongg.png \
+	hicolor_apps_22x22_gnome-mahjongg.png \
+	hicolor_apps_24x24_gnome-mahjongg.png \
+	hicolor_apps_32x32_gnome-mahjongg.png \
+	hicolor_apps_48x48_gnome-mahjongg.png \
+	hicolor_apps_scalable_gnome-mahjongg.svg \
+	$(NULL)
+endif
+
+if BUILD_SAME_GNOME
+dist_noinst_DATA += \
+	hicolor_apps_16x16_gnome-samegnome.png \
+	hicolor_apps_22x22_gnome-samegnome.png \
+	hicolor_apps_24x24_gnome-samegnome.png \
+	hicolor_apps_32x32_gnome-samegnome.png \
+	hicolor_apps_48x48_gnome-samegnome.png \
+	hicolor_apps_scalable_gnome-samegnome.svg \
+	$(NULL)
+endif
 
 private_icons = \
 	hicolor_actions_16x16_cards-deal.png \
@@ -157,57 +229,26 @@ private_icons += \
 	$(NULL)
 endif # !HAVE_HILDON
 
-if HAVE_HILDON
-
-iconcontext = hildon
-icon16dir = $(datadir)/icons/hicolor/16x16/hildon
-icon26dir = $(datadir)/icons/hicolor/26x26/hildon
-icon34dir = $(datadir)/icons/hicolor/34x34/hildon
-icon40dir = $(datadir)/icons/hicolor/40x40/hildon
-icon50dir = $(datadir)/icons/hicolor/50x50/hildon
-iconscalabledir = $(datadir)/icons/hicolor/scalable/hildon
-
-icon16_DATA = $(icons_16)
-icon26_DATA = $(icons_26)
-icon34_DATA = $(icons_34)
-icon40_DATA = $(icons_40)
-icon50_DATA = $(icons_50)
-iconscalable_DATA = $(icons_64_54)
-
-else
-
-icon16dir = $(datadir)/icons/hicolor/16x16/apps
-icon22dir = $(datadir)/icons/hicolor/22x22/apps
-icon24dir = $(datadir)/icons/hicolor/24x24/apps
-icon32dir = $(datadir)/icons/hicolor/32x32/apps
-icon48dir = $(datadir)/icons/hicolor/48x48/apps
-iconscalabledir = $(datadir)/icons/hicolor/scalable/apps
-
-icon16_DATA = $(icons_16)
-icon22_DATA = $(icons_22)
-icon24_DATA = $(icons_24)
-icon32_DATA = $(icons_32)
-icon48_DATA = $(icons_48)
-iconscalable_DATA = $(icons_svg)
-
-endif
-
 EXTRA_DIST = \
-	$(icons_16)	\
-	$(icons_22)	\
-	$(icons_24)	\
-	$(icons_26)	\
-	$(icons_32)	\
-	$(icons_34)	\
-	$(icons_40)	\
-	$(icons_48)	\
-	$(icons_50)	\
-	$(icons_64_54)	\
-	$(icons_svg)	\
 	$(private_icons)\
 	$(NULL)
 
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+# The extra treatment for Hildon is necessary because hildon only looks for
+# icons in the "hildon" context [https://bugs.maemo.org/show_bug.cgi?id=4766].
+
+install-public-icons:
+	for icon in $(dist_noinst_DATA); do \
+		THEME=`echo $$icon | cut -d_ -f1`; \
+		if test -n "@HAVE_HILDON_TRUE@"; then \
+			CONTEXT=`echo $$icon | cut -d_ -f2`; \
+		else \
+			CONTEXT=hildon; \
+		fi; \
+		SIZE=`echo $$icon | cut -d_ -f3`; \
+		ICONFILE=`echo $$icon | cut -d_ -f4`; \
+		mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+	done
 
 install-private-icons:
 	for icon in $(private_icons); do \
@@ -223,6 +264,19 @@ install-private-icons:
 		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
 	done
 
+uninstall-public-icons:
+	-for icon in $(dist_noinst_DATA); do \
+		THEME=`echo $$icon | cut -d_ -f1`; \
+		if test -n "@HAVE_HILDON_TRUE@"; then \
+			CONTEXT=`echo $$icon | cut -d_ -f2`; \
+		else \
+			CONTEXT=hildon; \
+		fi; \
+		SIZE=`echo $$icon | cut -d_ -f3`; \
+		ICONFILE=`echo $$icon | cut -d_ -f4`; \
+		rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+	done
+
 uninstall-private-icons:
 	for icon in $(private_icons); do \
 		THEME=`echo $$icon | cut -d_ -f1`; \
@@ -236,16 +290,23 @@ uninstall-private-icons:
 		rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
 	done
 
-install-data-local: install-private-icons
-uninstall-local: uninstall-private-icons
+install-data-local: install-public-icons install-private-icons
+uninstall-local: uninstall-public-icons uninstall-private-icons
 
 install-data-hook: update-icon-cache
 uninstall-hook: update-icon-cache
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t
+
 update-icon-cache:
 	@-if test -z "$(DESTDIR)"; then \
 		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
+		for theme in $(public_icons_themes); do \
+			$(gtk_update_icon_cache) $(datadir)/icons/$$theme; \
+		done; \
 	else \
 		echo "*** Icon cache not updated.  After (un)install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
+		for theme in $(public_icons_themes); do \
+			echo "***   $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \
+		done; \
 	fi
diff --git a/icons/16x16/gnome-aisleriot.png b/icons/hicolor_apps_16x16_gnome-aisleriot.png
similarity index 100%
rename from icons/16x16/gnome-aisleriot.png
rename to icons/hicolor_apps_16x16_gnome-aisleriot.png
diff --git a/icons/16x16/gnome-blackjack.png b/icons/hicolor_apps_16x16_gnome-blackjack.png
similarity index 100%
rename from icons/16x16/gnome-blackjack.png
rename to icons/hicolor_apps_16x16_gnome-blackjack.png
diff --git a/icons/16x16/gnome-freecell.png b/icons/hicolor_apps_16x16_gnome-freecell.png
similarity index 100%
rename from icons/16x16/gnome-freecell.png
rename to icons/hicolor_apps_16x16_gnome-freecell.png
diff --git a/icons/16x16/gnome-glchess.png b/icons/hicolor_apps_16x16_gnome-glchess.png
similarity index 100%
rename from icons/16x16/gnome-glchess.png
rename to icons/hicolor_apps_16x16_gnome-glchess.png
diff --git a/icons/16x16/gnome-glines.png b/icons/hicolor_apps_16x16_gnome-glines.png
similarity index 100%
rename from icons/16x16/gnome-glines.png
rename to icons/hicolor_apps_16x16_gnome-glines.png
diff --git a/icons/16x16/gnome-gnect.png b/icons/hicolor_apps_16x16_gnome-gnect.png
similarity index 100%
rename from icons/16x16/gnome-gnect.png
rename to icons/hicolor_apps_16x16_gnome-gnect.png
diff --git a/icons/16x16/gnome-gnibbles.png b/icons/hicolor_apps_16x16_gnome-gnibbles.png
similarity index 100%
rename from icons/16x16/gnome-gnibbles.png
rename to icons/hicolor_apps_16x16_gnome-gnibbles.png
diff --git a/icons/16x16/gnome-gnometris.png b/icons/hicolor_apps_16x16_gnome-gnometris.png
similarity index 100%
rename from icons/16x16/gnome-gnometris.png
rename to icons/hicolor_apps_16x16_gnome-gnometris.png
diff --git a/icons/16x16/gnome-iagno.png b/icons/hicolor_apps_16x16_gnome-iagno.png
similarity index 100%
rename from icons/16x16/gnome-iagno.png
rename to icons/hicolor_apps_16x16_gnome-iagno.png
diff --git a/icons/16x16/gnome-klotski.png b/icons/hicolor_apps_16x16_gnome-klotski.png
similarity index 100%
rename from icons/16x16/gnome-klotski.png
rename to icons/hicolor_apps_16x16_gnome-klotski.png
diff --git a/icons/16x16/gnome-mahjongg.png b/icons/hicolor_apps_16x16_gnome-mahjongg.png
similarity index 100%
rename from icons/16x16/gnome-mahjongg.png
rename to icons/hicolor_apps_16x16_gnome-mahjongg.png
diff --git a/icons/16x16/gnome-mines.png b/icons/hicolor_apps_16x16_gnome-mines.png
similarity index 100%
rename from icons/16x16/gnome-mines.png
rename to icons/hicolor_apps_16x16_gnome-mines.png
diff --git a/icons/16x16/gnome-robots.png b/icons/hicolor_apps_16x16_gnome-robots.png
similarity index 100%
rename from icons/16x16/gnome-robots.png
rename to icons/hicolor_apps_16x16_gnome-robots.png
diff --git a/icons/16x16/gnome-samegnome.png b/icons/hicolor_apps_16x16_gnome-samegnome.png
similarity index 100%
rename from icons/16x16/gnome-samegnome.png
rename to icons/hicolor_apps_16x16_gnome-samegnome.png
diff --git a/icons/16x16/gnome-sudoku.png b/icons/hicolor_apps_16x16_gnome-sudoku.png
similarity index 100%
rename from icons/16x16/gnome-sudoku.png
rename to icons/hicolor_apps_16x16_gnome-sudoku.png
diff --git a/icons/16x16/gnome-tali.png b/icons/hicolor_apps_16x16_gnome-tali.png
similarity index 100%
rename from icons/16x16/gnome-tali.png
rename to icons/hicolor_apps_16x16_gnome-tali.png
diff --git a/icons/16x16/gnome-tetravex.png b/icons/hicolor_apps_16x16_gnome-tetravex.png
similarity index 100%
rename from icons/16x16/gnome-tetravex.png
rename to icons/hicolor_apps_16x16_gnome-tetravex.png
diff --git a/icons/22x22/gnome-aisleriot.png b/icons/hicolor_apps_22x22_gnome-aisleriot.png
similarity index 100%
rename from icons/22x22/gnome-aisleriot.png
rename to icons/hicolor_apps_22x22_gnome-aisleriot.png
diff --git a/icons/22x22/gnome-blackjack.png b/icons/hicolor_apps_22x22_gnome-blackjack.png
similarity index 100%
rename from icons/22x22/gnome-blackjack.png
rename to icons/hicolor_apps_22x22_gnome-blackjack.png
diff --git a/icons/22x22/gnome-freecell.png b/icons/hicolor_apps_22x22_gnome-freecell.png
similarity index 100%
rename from icons/22x22/gnome-freecell.png
rename to icons/hicolor_apps_22x22_gnome-freecell.png
diff --git a/icons/22x22/gnome-glchess.png b/icons/hicolor_apps_22x22_gnome-glchess.png
similarity index 100%
rename from icons/22x22/gnome-glchess.png
rename to icons/hicolor_apps_22x22_gnome-glchess.png
diff --git a/icons/22x22/gnome-glines.png b/icons/hicolor_apps_22x22_gnome-glines.png
similarity index 100%
rename from icons/22x22/gnome-glines.png
rename to icons/hicolor_apps_22x22_gnome-glines.png
diff --git a/icons/22x22/gnome-gnect.png b/icons/hicolor_apps_22x22_gnome-gnect.png
similarity index 100%
rename from icons/22x22/gnome-gnect.png
rename to icons/hicolor_apps_22x22_gnome-gnect.png
diff --git a/icons/22x22/gnome-gnibbles.png b/icons/hicolor_apps_22x22_gnome-gnibbles.png
similarity index 100%
rename from icons/22x22/gnome-gnibbles.png
rename to icons/hicolor_apps_22x22_gnome-gnibbles.png
diff --git a/icons/22x22/gnome-gnometris.png b/icons/hicolor_apps_22x22_gnome-gnometris.png
similarity index 100%
rename from icons/22x22/gnome-gnometris.png
rename to icons/hicolor_apps_22x22_gnome-gnometris.png
diff --git a/icons/22x22/gnome-iagno.png b/icons/hicolor_apps_22x22_gnome-iagno.png
similarity index 100%
rename from icons/22x22/gnome-iagno.png
rename to icons/hicolor_apps_22x22_gnome-iagno.png
diff --git a/icons/22x22/gnome-klotski.png b/icons/hicolor_apps_22x22_gnome-klotski.png
similarity index 100%
rename from icons/22x22/gnome-klotski.png
rename to icons/hicolor_apps_22x22_gnome-klotski.png
diff --git a/icons/22x22/gnome-mahjongg.png b/icons/hicolor_apps_22x22_gnome-mahjongg.png
similarity index 100%
rename from icons/22x22/gnome-mahjongg.png
rename to icons/hicolor_apps_22x22_gnome-mahjongg.png
diff --git a/icons/22x22/gnome-mines.png b/icons/hicolor_apps_22x22_gnome-mines.png
similarity index 100%
rename from icons/22x22/gnome-mines.png
rename to icons/hicolor_apps_22x22_gnome-mines.png
diff --git a/icons/22x22/gnome-robots.png b/icons/hicolor_apps_22x22_gnome-robots.png
similarity index 100%
rename from icons/22x22/gnome-robots.png
rename to icons/hicolor_apps_22x22_gnome-robots.png
diff --git a/icons/22x22/gnome-samegnome.png b/icons/hicolor_apps_22x22_gnome-samegnome.png
similarity index 100%
rename from icons/22x22/gnome-samegnome.png
rename to icons/hicolor_apps_22x22_gnome-samegnome.png
diff --git a/icons/22x22/gnome-sudoku.png b/icons/hicolor_apps_22x22_gnome-sudoku.png
similarity index 100%
rename from icons/22x22/gnome-sudoku.png
rename to icons/hicolor_apps_22x22_gnome-sudoku.png
diff --git a/icons/22x22/gnome-tali.png b/icons/hicolor_apps_22x22_gnome-tali.png
similarity index 100%
rename from icons/22x22/gnome-tali.png
rename to icons/hicolor_apps_22x22_gnome-tali.png
diff --git a/icons/22x22/gnome-tetravex.png b/icons/hicolor_apps_22x22_gnome-tetravex.png
similarity index 100%
rename from icons/22x22/gnome-tetravex.png
rename to icons/hicolor_apps_22x22_gnome-tetravex.png
diff --git a/icons/24x24/gnome-aisleriot.png b/icons/hicolor_apps_24x24_gnome-aisleriot.png
similarity index 100%
rename from icons/24x24/gnome-aisleriot.png
rename to icons/hicolor_apps_24x24_gnome-aisleriot.png
diff --git a/icons/24x24/gnome-blackjack.png b/icons/hicolor_apps_24x24_gnome-blackjack.png
similarity index 100%
rename from icons/24x24/gnome-blackjack.png
rename to icons/hicolor_apps_24x24_gnome-blackjack.png
diff --git a/icons/24x24/gnome-freecell.png b/icons/hicolor_apps_24x24_gnome-freecell.png
similarity index 100%
rename from icons/24x24/gnome-freecell.png
rename to icons/hicolor_apps_24x24_gnome-freecell.png
diff --git a/icons/24x24/gnome-glchess.png b/icons/hicolor_apps_24x24_gnome-glchess.png
similarity index 100%
rename from icons/24x24/gnome-glchess.png
rename to icons/hicolor_apps_24x24_gnome-glchess.png
diff --git a/icons/24x24/gnome-glines.png b/icons/hicolor_apps_24x24_gnome-glines.png
similarity index 100%
rename from icons/24x24/gnome-glines.png
rename to icons/hicolor_apps_24x24_gnome-glines.png
diff --git a/icons/24x24/gnome-gnect.png b/icons/hicolor_apps_24x24_gnome-gnect.png
similarity index 100%
rename from icons/24x24/gnome-gnect.png
rename to icons/hicolor_apps_24x24_gnome-gnect.png
diff --git a/icons/24x24/gnome-gnibbles.png b/icons/hicolor_apps_24x24_gnome-gnibbles.png
similarity index 100%
rename from icons/24x24/gnome-gnibbles.png
rename to icons/hicolor_apps_24x24_gnome-gnibbles.png
diff --git a/icons/24x24/gnome-gnometris.png b/icons/hicolor_apps_24x24_gnome-gnometris.png
similarity index 100%
rename from icons/24x24/gnome-gnometris.png
rename to icons/hicolor_apps_24x24_gnome-gnometris.png
diff --git a/icons/24x24/gnome-iagno.png b/icons/hicolor_apps_24x24_gnome-iagno.png
similarity index 100%
rename from icons/24x24/gnome-iagno.png
rename to icons/hicolor_apps_24x24_gnome-iagno.png
diff --git a/icons/24x24/gnome-klotski.png b/icons/hicolor_apps_24x24_gnome-klotski.png
similarity index 100%
rename from icons/24x24/gnome-klotski.png
rename to icons/hicolor_apps_24x24_gnome-klotski.png
diff --git a/icons/24x24/gnome-mahjongg.png b/icons/hicolor_apps_24x24_gnome-mahjongg.png
similarity index 100%
rename from icons/24x24/gnome-mahjongg.png
rename to icons/hicolor_apps_24x24_gnome-mahjongg.png
diff --git a/icons/24x24/gnome-mines.png b/icons/hicolor_apps_24x24_gnome-mines.png
similarity index 100%
rename from icons/24x24/gnome-mines.png
rename to icons/hicolor_apps_24x24_gnome-mines.png
diff --git a/icons/24x24/gnome-robots.png b/icons/hicolor_apps_24x24_gnome-robots.png
similarity index 100%
rename from icons/24x24/gnome-robots.png
rename to icons/hicolor_apps_24x24_gnome-robots.png
diff --git a/icons/24x24/gnome-samegnome.png b/icons/hicolor_apps_24x24_gnome-samegnome.png
similarity index 100%
rename from icons/24x24/gnome-samegnome.png
rename to icons/hicolor_apps_24x24_gnome-samegnome.png
diff --git a/icons/24x24/gnome-sudoku.png b/icons/hicolor_apps_24x24_gnome-sudoku.png
similarity index 100%
rename from icons/24x24/gnome-sudoku.png
rename to icons/hicolor_apps_24x24_gnome-sudoku.png
diff --git a/icons/24x24/gnome-tali.png b/icons/hicolor_apps_24x24_gnome-tali.png
similarity index 100%
rename from icons/24x24/gnome-tali.png
rename to icons/hicolor_apps_24x24_gnome-tali.png
diff --git a/icons/24x24/gnome-tetravex.png b/icons/hicolor_apps_24x24_gnome-tetravex.png
similarity index 100%
rename from icons/24x24/gnome-tetravex.png
rename to icons/hicolor_apps_24x24_gnome-tetravex.png
diff --git a/icons/26x26/gnome-aisleriot.png b/icons/hicolor_apps_26x26_gnome-aisleriot.png
similarity index 100%
rename from icons/26x26/gnome-aisleriot.png
rename to icons/hicolor_apps_26x26_gnome-aisleriot.png
diff --git a/icons/32x32/gnome-aisleriot.png b/icons/hicolor_apps_32x32_gnome-aisleriot.png
similarity index 100%
rename from icons/32x32/gnome-aisleriot.png
rename to icons/hicolor_apps_32x32_gnome-aisleriot.png
diff --git a/icons/32x32/gnome-blackjack.png b/icons/hicolor_apps_32x32_gnome-blackjack.png
similarity index 100%
rename from icons/32x32/gnome-blackjack.png
rename to icons/hicolor_apps_32x32_gnome-blackjack.png
diff --git a/icons/32x32/gnome-freecell.png b/icons/hicolor_apps_32x32_gnome-freecell.png
similarity index 100%
rename from icons/32x32/gnome-freecell.png
rename to icons/hicolor_apps_32x32_gnome-freecell.png
diff --git a/icons/32x32/gnome-glchess.png b/icons/hicolor_apps_32x32_gnome-glchess.png
similarity index 100%
rename from icons/32x32/gnome-glchess.png
rename to icons/hicolor_apps_32x32_gnome-glchess.png
diff --git a/icons/32x32/gnome-glines.png b/icons/hicolor_apps_32x32_gnome-glines.png
similarity index 100%
rename from icons/32x32/gnome-glines.png
rename to icons/hicolor_apps_32x32_gnome-glines.png
diff --git a/icons/32x32/gnome-gnect.png b/icons/hicolor_apps_32x32_gnome-gnect.png
similarity index 100%
rename from icons/32x32/gnome-gnect.png
rename to icons/hicolor_apps_32x32_gnome-gnect.png
diff --git a/icons/32x32/gnome-gnibbles.png b/icons/hicolor_apps_32x32_gnome-gnibbles.png
similarity index 100%
rename from icons/32x32/gnome-gnibbles.png
rename to icons/hicolor_apps_32x32_gnome-gnibbles.png
diff --git a/icons/32x32/gnome-gnometris.png b/icons/hicolor_apps_32x32_gnome-gnometris.png
similarity index 100%
rename from icons/32x32/gnome-gnometris.png
rename to icons/hicolor_apps_32x32_gnome-gnometris.png
diff --git a/icons/32x32/gnome-iagno.png b/icons/hicolor_apps_32x32_gnome-iagno.png
similarity index 100%
rename from icons/32x32/gnome-iagno.png
rename to icons/hicolor_apps_32x32_gnome-iagno.png
diff --git a/icons/32x32/gnome-klotski.png b/icons/hicolor_apps_32x32_gnome-klotski.png
similarity index 100%
rename from icons/32x32/gnome-klotski.png
rename to icons/hicolor_apps_32x32_gnome-klotski.png
diff --git a/icons/32x32/gnome-mahjongg.png b/icons/hicolor_apps_32x32_gnome-mahjongg.png
similarity index 100%
rename from icons/32x32/gnome-mahjongg.png
rename to icons/hicolor_apps_32x32_gnome-mahjongg.png
diff --git a/icons/32x32/gnome-mines.png b/icons/hicolor_apps_32x32_gnome-mines.png
similarity index 100%
rename from icons/32x32/gnome-mines.png
rename to icons/hicolor_apps_32x32_gnome-mines.png
diff --git a/icons/32x32/gnome-robots.png b/icons/hicolor_apps_32x32_gnome-robots.png
similarity index 100%
rename from icons/32x32/gnome-robots.png
rename to icons/hicolor_apps_32x32_gnome-robots.png
diff --git a/icons/32x32/gnome-samegnome.png b/icons/hicolor_apps_32x32_gnome-samegnome.png
similarity index 100%
rename from icons/32x32/gnome-samegnome.png
rename to icons/hicolor_apps_32x32_gnome-samegnome.png
diff --git a/icons/32x32/gnome-sudoku.png b/icons/hicolor_apps_32x32_gnome-sudoku.png
similarity index 100%
rename from icons/32x32/gnome-sudoku.png
rename to icons/hicolor_apps_32x32_gnome-sudoku.png
diff --git a/icons/32x32/gnome-tali.png b/icons/hicolor_apps_32x32_gnome-tali.png
similarity index 100%
rename from icons/32x32/gnome-tali.png
rename to icons/hicolor_apps_32x32_gnome-tali.png
diff --git a/icons/32x32/gnome-tetravex.png b/icons/hicolor_apps_32x32_gnome-tetravex.png
similarity index 100%
rename from icons/32x32/gnome-tetravex.png
rename to icons/hicolor_apps_32x32_gnome-tetravex.png
diff --git a/icons/34x34/gnome-aisleriot.png b/icons/hicolor_apps_34x34_gnome-aisleriot.png
similarity index 100%
rename from icons/34x34/gnome-aisleriot.png
rename to icons/hicolor_apps_34x34_gnome-aisleriot.png
diff --git a/icons/40x40/gnome-aisleriot.png b/icons/hicolor_apps_40x40_gnome-aisleriot.png
similarity index 100%
rename from icons/40x40/gnome-aisleriot.png
rename to icons/hicolor_apps_40x40_gnome-aisleriot.png
diff --git a/icons/48x48/gnome-aisleriot.png b/icons/hicolor_apps_48x48_gnome-aisleriot.png
similarity index 100%
rename from icons/48x48/gnome-aisleriot.png
rename to icons/hicolor_apps_48x48_gnome-aisleriot.png
diff --git a/icons/48x48/gnome-blackjack.png b/icons/hicolor_apps_48x48_gnome-blackjack.png
similarity index 100%
rename from icons/48x48/gnome-blackjack.png
rename to icons/hicolor_apps_48x48_gnome-blackjack.png
diff --git a/icons/48x48/gnome-freecell.png b/icons/hicolor_apps_48x48_gnome-freecell.png
similarity index 100%
rename from icons/48x48/gnome-freecell.png
rename to icons/hicolor_apps_48x48_gnome-freecell.png
diff --git a/icons/48x48/gnome-glchess.png b/icons/hicolor_apps_48x48_gnome-glchess.png
similarity index 100%
rename from icons/48x48/gnome-glchess.png
rename to icons/hicolor_apps_48x48_gnome-glchess.png
diff --git a/icons/48x48/gnome-glines.png b/icons/hicolor_apps_48x48_gnome-glines.png
similarity index 100%
rename from icons/48x48/gnome-glines.png
rename to icons/hicolor_apps_48x48_gnome-glines.png
diff --git a/icons/48x48/gnome-gnect.png b/icons/hicolor_apps_48x48_gnome-gnect.png
similarity index 100%
rename from icons/48x48/gnome-gnect.png
rename to icons/hicolor_apps_48x48_gnome-gnect.png
diff --git a/icons/48x48/gnome-gnibbles.png b/icons/hicolor_apps_48x48_gnome-gnibbles.png
similarity index 100%
rename from icons/48x48/gnome-gnibbles.png
rename to icons/hicolor_apps_48x48_gnome-gnibbles.png
diff --git a/icons/48x48/gnome-gnometris.png b/icons/hicolor_apps_48x48_gnome-gnometris.png
similarity index 100%
rename from icons/48x48/gnome-gnometris.png
rename to icons/hicolor_apps_48x48_gnome-gnometris.png
diff --git a/icons/48x48/gnome-iagno.png b/icons/hicolor_apps_48x48_gnome-iagno.png
similarity index 100%
rename from icons/48x48/gnome-iagno.png
rename to icons/hicolor_apps_48x48_gnome-iagno.png
diff --git a/icons/48x48/gnome-klotski.png b/icons/hicolor_apps_48x48_gnome-klotski.png
similarity index 100%
rename from icons/48x48/gnome-klotski.png
rename to icons/hicolor_apps_48x48_gnome-klotski.png
diff --git a/icons/48x48/gnome-mahjongg.png b/icons/hicolor_apps_48x48_gnome-mahjongg.png
similarity index 100%
rename from icons/48x48/gnome-mahjongg.png
rename to icons/hicolor_apps_48x48_gnome-mahjongg.png
diff --git a/icons/48x48/gnome-mines.png b/icons/hicolor_apps_48x48_gnome-mines.png
similarity index 100%
rename from icons/48x48/gnome-mines.png
rename to icons/hicolor_apps_48x48_gnome-mines.png
diff --git a/icons/48x48/gnome-robots.png b/icons/hicolor_apps_48x48_gnome-robots.png
similarity index 100%
rename from icons/48x48/gnome-robots.png
rename to icons/hicolor_apps_48x48_gnome-robots.png
diff --git a/icons/48x48/gnome-samegnome.png b/icons/hicolor_apps_48x48_gnome-samegnome.png
similarity index 100%
rename from icons/48x48/gnome-samegnome.png
rename to icons/hicolor_apps_48x48_gnome-samegnome.png
diff --git a/icons/48x48/gnome-sudoku.png b/icons/hicolor_apps_48x48_gnome-sudoku.png
similarity index 100%
rename from icons/48x48/gnome-sudoku.png
rename to icons/hicolor_apps_48x48_gnome-sudoku.png
diff --git a/icons/48x48/gnome-tali.png b/icons/hicolor_apps_48x48_gnome-tali.png
similarity index 100%
rename from icons/48x48/gnome-tali.png
rename to icons/hicolor_apps_48x48_gnome-tali.png
diff --git a/icons/48x48/gnome-tetravex.png b/icons/hicolor_apps_48x48_gnome-tetravex.png
similarity index 100%
rename from icons/48x48/gnome-tetravex.png
rename to icons/hicolor_apps_48x48_gnome-tetravex.png
diff --git a/icons/50x50/gnome-aisleriot.png b/icons/hicolor_apps_50x50_gnome-aisleriot.png
similarity index 100%
rename from icons/50x50/gnome-aisleriot.png
rename to icons/hicolor_apps_50x50_gnome-aisleriot.png
diff --git a/icons/64x54/gnome-aisleriot.png b/icons/hicolor_apps_scalable_gnome-aisleriot.png
similarity index 100%
rename from icons/64x54/gnome-aisleriot.png
rename to icons/hicolor_apps_scalable_gnome-aisleriot.png
diff --git a/icons/scalable/gnome-aisleriot.svg b/icons/hicolor_apps_scalable_gnome-aisleriot.svg
similarity index 100%
rename from icons/scalable/gnome-aisleriot.svg
rename to icons/hicolor_apps_scalable_gnome-aisleriot.svg
diff --git a/icons/scalable/gnome-blackjack.svg b/icons/hicolor_apps_scalable_gnome-blackjack.svg
similarity index 100%
rename from icons/scalable/gnome-blackjack.svg
rename to icons/hicolor_apps_scalable_gnome-blackjack.svg
diff --git a/icons/scalable/gnome-freecell.svg b/icons/hicolor_apps_scalable_gnome-freecell.svg
similarity index 100%
rename from icons/scalable/gnome-freecell.svg
rename to icons/hicolor_apps_scalable_gnome-freecell.svg
diff --git a/icons/scalable/gnome-glchess.svg b/icons/hicolor_apps_scalable_gnome-glchess.svg
similarity index 100%
rename from icons/scalable/gnome-glchess.svg
rename to icons/hicolor_apps_scalable_gnome-glchess.svg
diff --git a/icons/scalable/gnome-glines.svg b/icons/hicolor_apps_scalable_gnome-glines.svg
similarity index 100%
rename from icons/scalable/gnome-glines.svg
rename to icons/hicolor_apps_scalable_gnome-glines.svg
diff --git a/icons/scalable/gnome-gnect.svg b/icons/hicolor_apps_scalable_gnome-gnect.svg
similarity index 100%
rename from icons/scalable/gnome-gnect.svg
rename to icons/hicolor_apps_scalable_gnome-gnect.svg
diff --git a/icons/scalable/gnome-gnibbles.svg b/icons/hicolor_apps_scalable_gnome-gnibbles.svg
similarity index 100%
rename from icons/scalable/gnome-gnibbles.svg
rename to icons/hicolor_apps_scalable_gnome-gnibbles.svg
diff --git a/icons/scalable/gnome-gnometris.svg b/icons/hicolor_apps_scalable_gnome-gnometris.svg
similarity index 100%
rename from icons/scalable/gnome-gnometris.svg
rename to icons/hicolor_apps_scalable_gnome-gnometris.svg
diff --git a/icons/scalable/gnome-iagno.svg b/icons/hicolor_apps_scalable_gnome-iagno.svg
similarity index 100%
rename from icons/scalable/gnome-iagno.svg
rename to icons/hicolor_apps_scalable_gnome-iagno.svg
diff --git a/icons/scalable/gnome-klotski.svg b/icons/hicolor_apps_scalable_gnome-klotski.svg
similarity index 100%
rename from icons/scalable/gnome-klotski.svg
rename to icons/hicolor_apps_scalable_gnome-klotski.svg
diff --git a/icons/scalable/gnome-lightsoff.svg b/icons/hicolor_apps_scalable_gnome-lightsoff.svg
similarity index 100%
rename from icons/scalable/gnome-lightsoff.svg
rename to icons/hicolor_apps_scalable_gnome-lightsoff.svg
diff --git a/icons/scalable/gnome-mahjongg.svg b/icons/hicolor_apps_scalable_gnome-mahjongg.svg
similarity index 100%
rename from icons/scalable/gnome-mahjongg.svg
rename to icons/hicolor_apps_scalable_gnome-mahjongg.svg
diff --git a/icons/scalable/gnome-mines.svg b/icons/hicolor_apps_scalable_gnome-mines.svg
similarity index 100%
rename from icons/scalable/gnome-mines.svg
rename to icons/hicolor_apps_scalable_gnome-mines.svg
diff --git a/icons/scalable/gnome-robots.svg b/icons/hicolor_apps_scalable_gnome-robots.svg
similarity index 100%
rename from icons/scalable/gnome-robots.svg
rename to icons/hicolor_apps_scalable_gnome-robots.svg
diff --git a/icons/scalable/gnome-samegnome.svg b/icons/hicolor_apps_scalable_gnome-samegnome.svg
similarity index 100%
rename from icons/scalable/gnome-samegnome.svg
rename to icons/hicolor_apps_scalable_gnome-samegnome.svg
diff --git a/icons/scalable/gnome-sudoku.svg b/icons/hicolor_apps_scalable_gnome-sudoku.svg
similarity index 100%
rename from icons/scalable/gnome-sudoku.svg
rename to icons/hicolor_apps_scalable_gnome-sudoku.svg
diff --git a/icons/scalable/gnome-tali.svg b/icons/hicolor_apps_scalable_gnome-tali.svg
similarity index 100%
rename from icons/scalable/gnome-tali.svg
rename to icons/hicolor_apps_scalable_gnome-tali.svg
diff --git a/icons/scalable/gnome-tetravex.svg b/icons/hicolor_apps_scalable_gnome-tetravex.svg
similarity index 100%
rename from icons/scalable/gnome-tetravex.svg
rename to icons/hicolor_apps_scalable_gnome-tetravex.svg
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]