[SCM] grass branch, master, updated. upstream/6.4.1-28-gb00cb96

[Hamish Bowman]

The following commit has been merged in the master branch:
commit b00cb96835dd018060914c27e7444c9f5ec1bf0a
Author: Hamish Bowman <hamish_b at yahoo.com>
Date:   Fri Sep 16 01:11:42 2011 +1200

    move 48x48 icon into correct dir

diff --git a/debian/grass.dirs b/debian/grass.dirs
index 8bc78d4..c43c7fc 100644
--- a/debian/grass.dirs
+++ b/debian/grass.dirs
@@ -3,3 +3,4 @@ usr/bin
 usr/share/doc/grass
 usr/share/man
 usr/share/icons/hicolor/32x32/apps
+usr/share/icons/hicolor/48x48/apps
diff --git a/debian/grass.dirs.in b/debian/grass.dirs.in
index e04321b..69fbd3b 100644
--- a/debian/grass.dirs.in
+++ b/debian/grass.dirs.in
@@ -3,3 +3,4 @@ usr/bin
 usr/share/doc/grass
 usr/share/man
 usr/share/icons/hicolor/32x32/apps
+usr/share/icons/hicolor/48x48/apps
diff --git a/debian/rules b/debian/rules
index e548712..70b52d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -190,12 +190,12 @@ install: build
 		debian/tmp/usr/bin
 	# is there a better way to make these exist?
 	mkdir -p debian/tmp/usr/share/icons/hicolor/32x32/apps
-	mkdir -p debian/tmp/usr/share/icons/hicolor/48x48
+	mkdir -p debian/tmp/usr/share/icons/hicolor/48x48/apps
 	mkdir -p debian/tmp/usr/share/applications
 	install -m 644 debian/grass.xpm \
 		debian/tmp/usr/share/icons/hicolor/32x32/apps/$(BASE_NAME).xpm
 	install -m 644 gui/icons/grass-48x48.png \
-		debian/tmp/usr/share/icons/hicolor/48x48/$(BASE_NAME).png
+		debian/tmp/usr/share/icons/hicolor/48x48/apps/$(BASE_NAME).png
 	install -m 644 gui/icons/grass.desktop \
 		debian/tmp/usr/share/applications/$(BASE_NAME).desktop
 	# 6.4.1 shipped with "grass65" as the Exec target

-- 
Geographic Resources Analysis Support System