Linux: rename icon file

DPKG: copy exe icon and desktop file in setup.py phase
RPM: handle renamed icon


git-svn-id: https://exe.svn.sourceforge.net/svnroot/exe/trunk@2856 38b22f21-9aea-0310-abfc-843a9883df58

3 files changed, 5 insertions, 2 deletions

diff --git a/exe_48x48.png b/exe.png
index c7c0c0f..c7c0c0f 100644
--- a/exe_48x48.png
+++ b/exe.png
diff --git a/installs/rpm/exe.spec b/installs/rpm/exe.spec
index 78e0099..38109d9 100644
--- a/installs/rpm/exe.spec
+++ b/installs/rpm/exe.spec
@@ -44,7 +44,7 @@ python rpm-setup.py build
 python rpm-setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
 cp -a twisted nevow formless $RPM_BUILD_ROOT%{_datadir}/exe
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-cp exe_48x48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/exe.png
+cp exe.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
 echo %{_datadir}/icons/hicolor/48x48/apps/exe.png >> INSTALLED_FILES
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/
 cp exe.desktop $RPM_BUILD_ROOT%{_datadir}/applications/
diff --git a/setup.py b/setup.py
index a64c871..eccb42f 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,10 @@ files = { '/usr/share/exe': ["README",
                              "NEWS", 
                              "ChangeLog",
                              "doc/eXe-tutorial.elp",
-                             "exe/webui/mr_x.gif"]}
+                             "exe/webui/mr_x.gif"],
+          '/usr/share/applications': ["exe.desktop"],
+          '/usr/share/icons/hicolor/48x48/apps': ["exe.png"],
+        }
 
 def dataFiles(baseSourceDir, baseDestDir, sourceDirs):
     """Recursively get all the files in these directories"""