[SCM] grass branch, master, updated. upstream/6.4.1-21-g8b412c0

[Hamish Bowman]

The following commit has been merged in the master branch:
commit 8b412c0bed5b1fc9a5c21e401a215073695d1ebc
Author: Hamish Bowman <hamish_b at yahoo.com>
Date:   Fri May 27 20:17:22 2011 +1200

    desktop icon cleaning, still needs testing and grass.desktop needs patching for final Icon= file/dir and possible renaming to grass64.desktop

diff --git a/debian/changelog b/debian/changelog
index 02cee17..f0d0362 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grass (6.4.1-2) unstable; urgency=low
+
+  * Desktop icon cleanup.
+
+ -- Hamish Bowman <hamish_b at yahoo.com>  Fri, 27 May 2011 17:02:14 +1200
+
 grass (6.4.1-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/grass.desktop b/debian/grass.desktop
deleted file mode 100644
index 36c62d1..0000000
--- a/debian/grass.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=GRASS GIS
-Comment=
-Categories=Application;Education;Geography;
-Exec=/usr/bin/grass
-Icon=/usr/share/icons/grass-48x48.png
-Terminal=true
diff --git a/debian/grass.install b/debian/grass.install
index a2da40c..7163c14 100644
--- a/debian/grass.install
+++ b/debian/grass.install
@@ -7,5 +7,7 @@ usr/lib/grass64/fonts
 usr/lib/grass64/scripts
 usr/lib/grass64/lib
 usr/lib/grass64/locale
-usr/share/icons
+usr/share/icons/hicolor/32x32
+gui/icons/grass-48x48.png /usr/share/icons/hicolor/48x48/grass64.png
+gui/icons/grass.desktop /usr/share/applications
 usr/bin/x-grass
diff --git a/debian/grass.menu b/debian/grass.menu
index d59edf1..3c65b3f 100644
--- a/debian/grass.menu
+++ b/debian/grass.menu
@@ -2,4 +2,4 @@
   section="Applications/Science/Geoscience"\
   title="GRASS GIS"\
   command="/usr/bin/grass"\
-  icon="/usr/share/icons/grass64.xpm"
+  icon="/usr/share/icons/hicolor/32x32/grass64.xpm"
diff --git a/debian/rules b/debian/rules
index d599d1a..19931b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -174,7 +174,7 @@ install: build
 
 	# install icon file for debian menu system
 	install -d debian/tmp/usr/share/icons debian/tmp/usr/bin
-	install -m 644 debian/grass.xpm debian/tmp/usr/share/icons/$(BASE_NAME).xpm
+	install -m 644 debian/grass.xpm debian/tmp/usr/share/icons/hicolor/32x32/apps/$(BASE_NAME).xpm
 	# install x-grass wrapper script
 	install -m 755 debian/x-grass debian/tmp/usr/bin/x-grass
 

-- 
Geographic Resources Analysis Support System