From 21c7be0b17b2cc335c0314d0ad62e3ed043a8154 Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Thu, 27 Sep 2012 22:23:06 +0200
Subject: [PATCH] Changed: Renamed some Linux files to not conflict with Ryzom
 package

---
 code/ryzom/client/unix/CMakeLists.txt         |  20 +++++++++---------
 ...zom.desktop.in => ryzom_client.desktop.in} |   0
 .../unix/{ryzom.png => ryzom_client.png}      | Bin
 .../unix/{ryzom.xpm => ryzom_client.xpm}      |   0
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename code/ryzom/client/unix/{ryzom.desktop.in => ryzom_client.desktop.in} (100%)
 rename code/ryzom/client/unix/{ryzom.png => ryzom_client.png} (100%)
 rename code/ryzom/client/unix/{ryzom.xpm => ryzom_client.xpm} (100%)

diff --git a/code/ryzom/client/unix/CMakeLists.txt b/code/ryzom/client/unix/CMakeLists.txt
index fef098783..54f2ed881 100644
--- a/code/ryzom/client/unix/CMakeLists.txt
+++ b/code/ryzom/client/unix/CMakeLists.txt
@@ -1,11 +1,11 @@
-CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/ryzom.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/ryzom.desktop")
+CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/ryzom_client.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/ryzom_client.desktop")
 
-INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/ryzom.desktop" DESTINATION share/applications)
-INSTALL(FILES ryzom.png DESTINATION share/pixmaps)
-INSTALL(FILES ryzom.xpm DESTINATION share/pixmaps)
-INSTALL(FILES ryzom_16x16.png DESTINATION share/icons/hicolor/16x16/apps RENAME ryzom.png)
-INSTALL(FILES ryzom_22x22.png DESTINATION share/icons/hicolor/22x22/apps RENAME ryzom.png)
-INSTALL(FILES ryzom_24x24.png DESTINATION share/icons/hicolor/24x24/apps RENAME ryzom.png)
-INSTALL(FILES ryzom_32x32.png DESTINATION share/icons/hicolor/32x32/apps RENAME ryzom.png)
-INSTALL(FILES ryzom_48x48.png DESTINATION share/icons/hicolor/48x48/apps RENAME ryzom.png)
-INSTALL(FILES ryzom_128x128.png DESTINATION share/icons/hicolor/128x128/apps RENAME ryzom.png)
+INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/ryzom_client.desktop" DESTINATION share/applications)
+INSTALL(FILES ryzom_client.png DESTINATION share/pixmaps)
+INSTALL(FILES ryzom_client.xpm DESTINATION share/pixmaps)
+INSTALL(FILES ryzom_16x16.png DESTINATION share/icons/hicolor/16x16/apps RENAME ryzom_client.png)
+INSTALL(FILES ryzom_22x22.png DESTINATION share/icons/hicolor/22x22/apps RENAME ryzom_client.png)
+INSTALL(FILES ryzom_24x24.png DESTINATION share/icons/hicolor/24x24/apps RENAME ryzom_client.png)
+INSTALL(FILES ryzom_32x32.png DESTINATION share/icons/hicolor/32x32/apps RENAME ryzom_client.png)
+INSTALL(FILES ryzom_48x48.png DESTINATION share/icons/hicolor/48x48/apps RENAME ryzom_client.png)
+INSTALL(FILES ryzom_128x128.png DESTINATION share/icons/hicolor/128x128/apps RENAME ryzom_client.png)
diff --git a/code/ryzom/client/unix/ryzom.desktop.in b/code/ryzom/client/unix/ryzom_client.desktop.in
similarity index 100%
rename from code/ryzom/client/unix/ryzom.desktop.in
rename to code/ryzom/client/unix/ryzom_client.desktop.in
diff --git a/code/ryzom/client/unix/ryzom.png b/code/ryzom/client/unix/ryzom_client.png
similarity index 100%
rename from code/ryzom/client/unix/ryzom.png
rename to code/ryzom/client/unix/ryzom_client.png
diff --git a/code/ryzom/client/unix/ryzom.xpm b/code/ryzom/client/unix/ryzom_client.xpm
similarity index 100%
rename from code/ryzom/client/unix/ryzom.xpm
rename to code/ryzom/client/unix/ryzom_client.xpm