From 155a5473f0a6d574189791ffbf604de45ef134d3 Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Fri, 2 Apr 2010 15:28:17 +0000
Subject: [PATCH] Move misc/e16.png to icons/.

SVN revision: 47703
---
 docs/e16.xml              |   2 +-
 icons/Makefile.am         |   2 +-
 {misc => icons}/e16.png   | Bin
 misc/Makefile.am          |   5 ++---
 misc/e16-gnome.desktop.in |   2 +-
 misc/e16-kde.desktop.in   |   2 +-
 misc/e16.desktop-app.in   |   2 +-
 misc/e16.desktop.in       |   2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)
 rename {misc => icons}/e16.png (100%)

diff --git a/docs/e16.xml b/docs/e16.xml
index fd418403..862ced1f 100644
--- a/docs/e16.xml
+++ b/docs/e16.xml
@@ -1657,7 +1657,7 @@ $ gnome-sesssion
 	Name=E16
 	Comment=The Enlightenment (E16) window manager
 	Exec=e16
-	Icon=/usr/share/e16/misc/e16.png
+	Icon=/usr/share/e16/icons/e16.png
       </programlisting></para>
 
       <para>The section below seems to be obsolete as of
diff --git a/icons/Makefile.am b/icons/Makefile.am
index befde520..bcb310bf 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -2,7 +2,7 @@ iconsdir = $(pkgdatadir)/icons
 
 icons_DATA = \
 	default.png \
-	e.png \
+	e.png e16.png \
 	iconbox.png \
 	mon.png \
 	pager.png
diff --git a/misc/e16.png b/icons/e16.png
similarity index 100%
rename from misc/e16.png
rename to icons/e16.png
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 59dfadb6..0ddb9d70 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -3,12 +3,11 @@ DESKTOPS_SES = e16.desktop e16-gnome.desktop e16-kde.desktop
 DESKTOPS_IN = e16.desktop-app.in e16.desktop.in e16-gnome.desktop.in e16-kde.desktop.in
 XCLIENTS = Xclients.e16.sh Xclients.e16-gnome.sh Xclients.e16-kde.sh
 STARTUPS = starte16-gnome starte16-kde
-ICONS = e16.png
 
 DESKTOPS = $(DESKTOPS_APP:.desktop=.desktop-app) $(DESKTOPS_SES)
 
 miscdir = $(pkgdatadir)/misc
-misc_DATA = $(ICONS) $(DESKTOPS)
+misc_DATA = $(DESKTOPS)
 misc_SCRIPTS = $(XCLIENTS) starte16 e16-dbus-cmd
 
 applicationdir = $(datadir)/applications
@@ -18,7 +17,7 @@ xsessiondir = $(datadir)/xsessions
 #xclientsdir = $(sysconfdir)/X11/xinit/Xclients.d
 #xclients_SCRIPTS = $(XCLIENTS)
 
-EXTRA_DIST = $(DESKTOPS_IN) $(XCLIENTS) $(SCRIPTS) $(ICONS) starte16.in
+EXTRA_DIST = $(DESKTOPS_IN) $(XCLIENTS) $(SCRIPTS) starte16.in
 
 CLEANFILES = $(DESKTOPS) starte16
 
diff --git a/misc/e16-gnome.desktop.in b/misc/e16-gnome.desktop.in
index 503b949a..44924803 100644
--- a/misc/e16-gnome.desktop.in
+++ b/misc/e16-gnome.desktop.in
@@ -5,4 +5,4 @@ Name=E16-GNOME
 Comment=This session starts GNOME using enlightenment (e16) as window manager
 Comment[it]=Questo avvia GNOME usando Enlightenment (e16) come window manager
 Exec=@pkgdatadir@/misc/starte16-gnome
-Icon=@pkgdatadir@/misc/e16.png
+Icon=@pkgdatadir@/icons/e16.png
diff --git a/misc/e16-kde.desktop.in b/misc/e16-kde.desktop.in
index 9da7be99..c423b387 100644
--- a/misc/e16-kde.desktop.in
+++ b/misc/e16-kde.desktop.in
@@ -5,4 +5,4 @@ Name=E16-KDE
 Comment=This session starts KDE using enlightenment (e16) as window manager
 Comment[it]=Questo avvia KDE usando Enlightenment (e16) come window manager
 Exec=@pkgdatadir@/misc/starte16-kde
-Icon=@pkgdatadir@/misc/e16.png
+Icon=@pkgdatadir@/icons/e16.png
diff --git a/misc/e16.desktop-app.in b/misc/e16.desktop-app.in
index cdcf0087..091804f4 100644
--- a/misc/e16.desktop-app.in
+++ b/misc/e16.desktop-app.in
@@ -5,4 +5,4 @@ Name=E16
 Comment=The Enlightenment (e16) window manager
 Comment[it]=Il window manager Enlightenment (e16)
 Exec=e16
-Icon=@pkgdatadir@/misc/e16.png
+Icon=@pkgdatadir@/icons/e16.png
diff --git a/misc/e16.desktop.in b/misc/e16.desktop.in
index ee3ae7e9..72754f21 100644
--- a/misc/e16.desktop.in
+++ b/misc/e16.desktop.in
@@ -5,4 +5,4 @@ Name=E16
 Comment=This session starts the Enlightenment (e16) window manager
 Comment[it]=Questo avvia il window manager Enlightenment (e16)
 Exec=@pkgdatadir@/misc/starte16
-Icon=@pkgdatadir@/misc/e16.png
+Icon=@pkgdatadir@/icons/e16.png