[SCM] saga branch, master, updated. upstream/2.0.8-138-g9611d39

[Johan Van de Wauw]

The following commit has been merged in the master branch:
commit 0dcc655b65d3b2291a4d47778cfe91c28ffce4a0
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Thu Nov 14 20:38:07 2013 -0500

    Use upstream .desktop file

diff --git a/debian/saga.install b/debian/saga.install
index 3ff0d6e..6f08cd6 100644
--- a/debian/saga.install
+++ b/debian/saga.install
@@ -1,6 +1,5 @@
-src/saga_core/saga_gui/res/xpm/saga_icon_32.xpm  /usr/share/pixmaps/
-src/saga_core/saga_gui/res/xpm/saga_icon_16.xpm  /usr/share/pixmaps/
-debian/saga_gui.desktop  /usr/share/applications/
+src/saga_core/saga_gui/res/saga.desktop /usr/share/applications/
+src/saga_core/saga_gui/res/saga.png /usr/share/pixmaps/
 src/saga_core/saga_gui/res/saga_tip.txt /usr/share/saga/
 usr/bin
 usr/lib/saga/*.so
diff --git a/debian/saga_gui.desktop b/debian/saga_gui.desktop
deleted file mode 100644
index 17e3684..0000000
--- a/debian/saga_gui.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=SAGA GIS
-GenericName=A System for an Automated Geographical Analysis 
-Comment=View and manipulate geographical information
-Type=Application
-Exec=saga_gui
-Icon=/usr/share/saga/saga_icon_32.xpm
-Categories=Science;Education;Geography;

-- 
Saga GIS