desktop/Makefile.am removed.

2006-03-29  Sven Neumann  <[email protected]>

        * desktop/Makefile.am
        * desktop/gimp.png: removed.

        * desktop/16x16/gimp.png
        * desktop/22x22/gimp.png
        * desktop/24x24/gimp.png
        * desktop/32x32/gimp.png
        * desktop/48x48/gimp.png
        * desktop/64x64/gimp.png
        * desktop/scalable/gimp.svg: new application icons in different
        sizes, contributed by Jakub Steiner.

        * themes/Default/images/Makefile.am
        * themes/Default/images/stock-wilber-32.png
        * themes/Default/images/stock-wilber-48.png: removed.

        * libgimpwidgets/Makefile.am
        * libgimpwidgets/wilber-16.png
        * libgimpwidgets/wilber-32.png
        * libgimpwidgets/wilber-48.png
        * libgimpwidgets/wilber-64.png: new window icons, identical to the
        new application icons.

        * libgimpwidgets/gimpwidgets-private.c: use the new window icons.

ChangeLog

@@ -1,3 +1,30 @@
+2006-03-29  Sven Neumann  <[email protected]>
+
+	* desktop/Makefile.am
+	* desktop/gimp.png: removed.
+
+	* desktop/16x16/gimp.png
+	* desktop/22x22/gimp.png
+	* desktop/24x24/gimp.png
+	* desktop/32x32/gimp.png
+	* desktop/48x48/gimp.png
+	* desktop/64x64/gimp.png
+	* desktop/scalable/gimp.svg: new application icons in different
+	sizes, contributed by Jakub Steiner.
+
+	* themes/Default/images/Makefile.am
+	* themes/Default/images/stock-wilber-32.png
+	* themes/Default/images/stock-wilber-48.png: removed.
+
+	* libgimpwidgets/Makefile.am
+	* libgimpwidgets/wilber-16.png
+	* libgimpwidgets/wilber-32.png
+	* libgimpwidgets/wilber-48.png
+	* libgimpwidgets/wilber-64.png: new window icons, identical to the
+	new application icons.
+
+	* libgimpwidgets/gimpwidgets-private.c: use the new window icons.
+
 2006-03-29  Sven Neumann  <[email protected]>
 
 	* app/plug-in/plug-in-message.c

desktop/Makefile.am

@@ -9,24 +9,48 @@ if DESKTOP_DATADIR
 applicationsdir = @DESKTOP_DATADIR@/applications
 applications_DATA = $(desktop_files)
 
-iconsdir = @DESKTOP_DATADIR@/icons/hicolor/48x48/apps
-icons_DATA = gimp.png
-
 mimeinfodir = @DESKTOP_DATADIR@/mime-info
 mimeinfo_DATA = gimp.keys
 
 registrydir = @DESKTOP_DATADIR@/application-registry
 registry_DATA = gimp.applications
 
+
+icons16dir = @DESKTOP_DATADIR@/icons/hicolor/16x16/apps
+icons16_DATA = 16x16/gimp.png
+
+icons22dir = @DESKTOP_DATADIR@/icons/hicolor/22x22/apps
+icons22_DATA = 22x22/gimp.png
+
+icons24dir = @DESKTOP_DATADIR@/icons/hicolor/24x24/apps
+icons24_DATA = 24x24/gimp.png
+
+icons32dir = @DESKTOP_DATADIR@/icons/hicolor/32x32/apps
+icons32_DATA = 32x32/gimp.png
+
+icons48dir = @DESKTOP_DATADIR@/icons/hicolor/48x48/apps
+icons48_DATA = 48x48/gimp.png
+
+icons64dir = @DESKTOP_DATADIR@/icons/hicolor/64x64/apps
+icons64_DATA = 64x64/gimp.png
+
+iconsscalabledir = @DESKTOP_DATADIR@/icons/hicolor/scalable/apps
+iconsscalable_DATA = scalable/gimp.svg
+
 endif
 
 
 EXTRA_DIST = \
 	gimp.applications.in	\
 	gimp.desktop.in.in	\
 	gimp.keys.in		\
-	gimp.png
-
+	16x16/gimp.png		\
+	22x22/gimp.png		\
+	24x24/gimp.png		\
+	32x32/gimp.png		\
+	48x48/gimp.png		\
+	64x64/gimp.png		\
+	scalable/gimp.svg
 
 DISTCLEANFILES = $(desktop_files)