Renamed icons to make things easier for Debian packaging, and the "-icon" part

was superfluous anyway.

8 files changed, 25 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 939d477c..c3c8f046 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-2007-03-12  Philipp Sehmisch  <tmw@crushnet.org>
+2007-03-14  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/main.cpp, src/tmw.rc, data/icons/tmw-icon.png,
+	data/icons/tmw-icon.xpm, data/icons/tmw.ico, data/icons/tmw-icon.ico,
+	data/icons/Makefile.am, data/icons/tmw.png, data/icons/tmw.xpm,
+	data/icons/CMakeLists.txt: Renamed icons to make things easier for
+	Debian packaging, and the "-icon" part was superfluous anyway.
+
+2007-03-12  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* src/simpleanimation.cpp, src/simpleanimation.h, src/CmakeLists.txt,
 	src/Makefile.am: Added a simple animation class that hosts a looping
@@ -6,8 +14,8 @@
 
 2007-03-12  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
-	* data/graphics/items/armor-head-rangerhat.png: New version of ranger hat
-	icon by Pauan.
+	* data/graphics/items/armor-head-rangerhat.png: New version of ranger
+	hat icon by Pauan.
 
 2007-03-11  Philipp Sehmisch  <tmw@crushnet.org>
 
@@ -17,10 +25,11 @@
 2007-03-09  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* data/graphics/gui/target-cursor-blue.png,
-	data/graphics/gui/target-cursor-red.png: Added targeting cursors by Pauan.
+	data/graphics/gui/target-cursor-red.png: Added targeting cursors by
+	Pauan.
 	* data/graphics/sprites/chest-cotton-male.png,
-	data/graphics/sprites/chest-cotton-female.png: Replaced cotton shirt with
-	improved version by Pauan.
+	data/graphics/sprites/chest-cotton-female.png: Replaced cotton shirt
+	with improved version by Pauan.
 
 2007-02-27  Philipp Sehmisch  <tmw@crushnet.org>
 
diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt
index 30d96d86..009ed32e 100644
--- a/data/icons/CMakeLists.txt
+++ b/data/icons/CMakeLists.txt
@@ -1,9 +1,9 @@
 SET(FILES
-    tmw-icon.ico
-    tmw-icon.png
-    tmw-icon.xpm
+    tmw.ico
+    tmw.png
+    tmw.xpm
     )
 
 INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/icons)
 
-INSTALL(FILES "tmw-icon.png" DESTINATION share/pixmaps RENAME tmw.png)
+INSTALL(FILES "tmw.png" DESTINATION share/pixmaps)
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 26dcd623..9697a363 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -2,13 +2,13 @@
 iconsdir = $(pkgdatadir)/data/icons
 
 icons_DATA =		\
-	tmw-icon.ico	\
-	tmw-icon.png	\
-	tmw-icon.xpm
+	tmw.ico	\
+	tmw.png	\
+	tmw.xpm
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps
-	$(INSTALL) $(srcdir)/tmw-icon.png $(DESTDIR)$(datadir)/pixmaps/tmw.png
+	$(INSTALL) $(srcdir)/tmw.png $(DESTDIR)$(datadir)/pixmaps/tmw.png
 
 uninstall-local:
 	rm -f $(DESTDIR)$(datadir)/pixmaps/tmw.png
diff --git a/data/icons/tmw-icon.ico b/data/icons/tmw.ico
index 5ba6e1b7..5ba6e1b7 100644
--- a/data/icons/tmw-icon.ico
+++ b/data/icons/tmw.ico
diff --git a/data/icons/tmw-icon.png b/data/icons/tmw.png
index 2598a620..2598a620 100644
--- a/data/icons/tmw-icon.png
+++ b/data/icons/tmw.png
diff --git a/data/icons/tmw-icon.xpm b/data/icons/tmw.xpm
index a9e91161..a9e91161 100644
--- a/data/icons/tmw-icon.xpm
+++ b/data/icons/tmw.xpm
diff --git a/src/main.cpp b/src/main.cpp
index 383e7f39..3cc32873 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -256,7 +256,7 @@ void init_engine(const Options &options)
     }
 
     SDL_WM_SetCaption("The Mana World", NULL);
-    SDL_WM_SetIcon(IMG_Load(TMW_DATADIR "data/icons/tmw-icon.png"), NULL);
+    SDL_WM_SetIcon(IMG_Load(TMW_DATADIR "data/icons/tmw.png"), NULL);
 
 #ifdef USE_OPENGL
     bool useOpenGL = (config.getValue("opengl", 0) == 1);
diff --git a/src/tmw.rc b/src/tmw.rc
index ee5f99cd..673b2387 100644
--- a/src/tmw.rc
+++ b/src/tmw.rc
@@ -2,7 +2,7 @@
 

 #include "winver.h"

 

-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tmw-icon.ico"

+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tmw.ico"

 

 1 VERSIONINFO

 FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD