[SCM] grass branch, master, updated. upstream/6.4.1-47-g23e9cbc

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit 23e9cbcc6dbed3d1ea77260b5a298869c9edcc57
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Sat Feb 25 00:40:42 2012 +1300

    update TODO, control pkg Description cleaning, make grass-gui directly depend on things it ships depend on instead of indirectly depend on them through the -core pkg

diff --git a/debian/TODO b/debian/TODO
index e81df6d..38a790e 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -7,17 +7,43 @@ moved to /var/lib/grass or /usr/lib/grass, leaving symlinks so to not
 break things.
 
 
+
 Package re-org:
 
-Move the programmers' manual out of grass-doc and into a new grass-doc-dev
-package, suggested by both grass-dev and grass-doc.
+[done]
+ Move the programmers' manual out of grass-doc and into a new
+ grass-doc-dev package, suggested by both grass-dev and grass-doc.
    /usr/share/doc/grass-doc/programming-manual/
 
-Move $GISBASE/etc/gui/ dm/ gm/ gtcltk/ wxpython/ nviz2.2/ v.digit/ form/
-into a separate grass-gui package, so that packages like QGIS don't
-have to install wxPython etc. as well.
 
-Move remaining contents of the grass binary package into grass-core,
-and make the 'grass' binary package a virtual one depending on both
-grass-core and grass-gui, and recommending grass-doc.
+[in progress]
+ Move $GISBASE/etc/gui/ dm/ gm/ gtcltk/ wxpython/ nviz2.2/ v.digit/ form/
+ into a separate grass-gui package, so that packages like QGIS don't
+ have to install wxPython etc. as well.
+ .
+ Move remaining contents of the grass binary package into grass-core,
+ and make the 'grass' binary package a virtual one depending on both
+ grass-core and grass-gui, and recommending grass-doc.
+
+
+
+FIXME:
+
+E: grass-core: package-installs-python-bytecode usr/lib/grass64/etc/python/grass/lib/*.pyc
+( -> remove in prerm, generate anew in postinst )
+
+
+grass-core.install gets $GISBASE/etc/, but how to exclude the 8 grass-gui
+dirs from that without explicitly listsing in grass-core.install the other
+78 (or so) files in $GISBASE/etc/?
+
+
+Make use of upstream's gui/icons/grass.desktop file (include it in the
+grass-core package as it will launch the text-only version too), but
+perhaps we need to patch the Exec= line and or filename with @VERSION@
+to follow the other .in files?
+.
+Currently we ignore upstream's grass.menu file, Debian pkging's version
+is @VERSION at .in compliant. Suggest we continue to do so.
+
 
diff --git a/debian/control b/debian/control
index 05d050b..a7e3c4e 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Architecture: all
 Depends: grass-core, grass-gui
 Recommends: grass-doc
 Suggests: grass-dev
-Description: Geographic Resources Analysis Support System 
+Description: GRASS GIS (The Geographic Resources Analysis Support System)
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,
  image processing, graphics/map production, spatial modeling, and
@@ -82,7 +82,7 @@ Suggests:
 # used by r.in.wms
   xml2
 Provides: grass642
-Description: Geographic Resources Analysis Support System 
+Description: GRASS GIS core components
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,
  image processing, graphics/map production, spatial modeling, and
@@ -95,7 +95,9 @@ Description: Geographic Resources Analysis Support System
 Package: grass-gui
 Section: science
 Architecture: any
-Depends: grass-core,
+Depends: ${shlibs:Depends},
+  grass-core,
+  python,
   python-wxgtk2.8,
 # pyGL needed for wxNviz
   python-opengl,
@@ -106,7 +108,7 @@ Recommends:
   ghostscript,
 # PIL needed for wxPsmap preview
   python-imaging
-Description: Geographic Resources Analysis Support System 
+Description: GRASS GIS graphical user interfaces
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,
  image processing, graphics/map production, spatial modeling, and
@@ -121,7 +123,7 @@ Section: doc
 Architecture: all
 Depends: ${misc:Depends}
 Suggests: grass, grass-dev-doc
-Description: Geographic Resources Analysis Support System documentation
+Description: GRASS GIS user documentation
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,
  image processing, graphics/map production, spatial modeling, and
@@ -136,7 +138,7 @@ Section: doc
 Architecture: all
 Depends: ${misc:Depends}
 Suggests: grass
-Description: Geographic Resources Analysis Support System documentation
+Description: The GRASS GIS Programmers' Manual
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,
  image processing, graphics/map production, spatial modeling, and

-- 
Geographic Resources Analysis Support System