[SCM] grass branch, master, updated. upstream/6.4.1-24-g3807f0c

[Hamish Bowman]

The following commit has been merged in the master branch:
commit a1c059ade33150e75168042ded98fcf4cda50c99
Author: Hamish Bowman <hamish_b at yahoo.com>
Date:   Sun May 29 14:20:44 2011 +1200

    more desktop icon cleaning; pkg recommends/suggests tweaking for wx.psmap

diff --git a/debian/changelog b/debian/changelog
index f0d0362..a970d8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 grass (6.4.1-2) unstable; urgency=low
 
+  [ Hamish Bowman ]
   * Desktop icon cleanup.
+  * Recommend wx; suggest gs, python-imaging.
 
- -- Hamish Bowman <hamish_b at yahoo.com>  Fri, 27 May 2011 17:02:14 +1200
+ -- Hamish Bowman <hamish_b at yahoo.com>  Sun, 29 May 2011 14:16:22 +1200
 
 grass (6.4.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 1b69f71..00a9f4d 100644
--- a/debian/control
+++ b/debian/control
@@ -19,9 +19,9 @@ Section: science
 Architecture: any
 Depends: ${shlibs:Depends}, xterm | x-terminal-emulator, python (>= 2.5), python-numpy,
  python-opengl, python-wxgtk2.8, ${misc:Depends}
-Suggests: grass-doc, gdal-bin, proj-bin, e00compr, avce00, gpsbabel, gpstrans,
- gnuplot, xml2, wget | curl, netpbm
-Recommends: ghostscript
+Suggests: gdal-bin, proj-bin, e00compr, avce00, gpsbabel, gpstrans,
+ gnuplot, xml2, wget | curl, netpbm, ghostscript, python-imaging
+Recommends: grass-doc, python-wxgtk2.8
 Provides: grass641
 Description: Geographic Resources Analysis Support System 
  Commonly referred to as GRASS, this is a Geographic Information
diff --git a/debian/grass.install b/debian/grass.install
index 7163c14..00607cf 100644
--- a/debian/grass.install
+++ b/debian/grass.install
@@ -9,5 +9,5 @@ usr/lib/grass64/lib
 usr/lib/grass64/locale
 usr/share/icons/hicolor/32x32
 gui/icons/grass-48x48.png /usr/share/icons/hicolor/48x48/grass64.png
-gui/icons/grass.desktop /usr/share/applications
+gui/icons/grass.desktop /usr/share/applications/grass64.desktop
 usr/bin/x-grass
diff --git a/debian/grass.install.in b/debian/grass.install.in
index 3ad200d..37a43eb 100644
--- a/debian/grass.install.in
+++ b/debian/grass.install.in
@@ -7,5 +7,7 @@ usr/lib/grass at VERSION@/fonts
 usr/lib/grass at VERSION@/scripts
 usr/lib/grass at VERSION@/lib
 usr/lib/grass at VERSION@/locale
-usr/share/icons
+usr/share/icons/hicolor/32x32
+gui/icons/grass-48x48.png /usr/share/icons/hicolor/48x48/grass at VERSION@.png
+gui/icons/grass.desktop /usr/share/applications/grass at VERSION@.desktop
 usr/bin/x-grass

-- 
Geographic Resources Analysis Support System