[SCM] grass branch, master, updated. upstream/6.4.1-58-g15f123e

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit 15f123ef5ab704689b19fbe543ff11f53c874dd7
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Sat Feb 25 19:28:51 2012 +1300

    restore man page, add symlinks for exe aliases, add a readme about how to run without a GUI

diff --git a/debian/README.RunningWithoutGUI b/debian/README.RunningWithoutGUI
new file mode 100644
index 0000000..b655749
--- /dev/null
+++ b/debian/README.RunningWithoutGUI
@@ -0,0 +1,30 @@
+There are a number of ways to run GRASS without a GUI.
+(for example if the grass-gui package has not been installed)
+
+
+Non-interactive:  (e.g. a cron job on a back-end server)
+  Use the GRASS_BATCH_JOB environment variable to set the path to
+  the job script. Note this method may not work over NFS in HPC
+  Grid computing situations. See the GRASS wiki for details and
+  the workaround.
+
+Interactive:
+  To use just the GRASS command line interface most things will
+  work as normal, including d.mon graphics X-monitors and rendering
+  with the PNG drivers. To avoid error messages you will probably
+  want to set "export GRASS_UI_TERM=1" in your ~/.grass.bashrc file
+  and run "g.gui text" within GRASS to set the default GUI mode.
+
+From Quantum GIS or R-Statistics:
+  For use with QGIS you just need the grass-core and grass-doc
+  packages to be installed. For use with R typically you'd start
+  your R session from the GRASS command prompt, but it is
+  technically possible to run GRASS as a background job from R
+  (see the non-interactive notes above).
+
+
+As always, help can be found on the GRASS Wiki site:
+  http://grass.osgeo.org/wiki/
+
+
+
diff --git a/debian/grass-core.docs b/debian/grass-core.docs
index 9996844..9174f7d 100644
--- a/debian/grass-core.docs
+++ b/debian/grass-core.docs
@@ -9,3 +9,4 @@ SUBMITTING_TCLTK
 contributors.csv
 contributors_extra.csv
 translators.csv
+debian/README.RunningWithoutGUI
diff --git a/debian/grass-core.links b/debian/grass-core.links
index eaae989..75dd9c4 100644
--- a/debian/grass-core.links
+++ b/debian/grass-core.links
@@ -1 +1,3 @@
 usr/bin/grass64 usr/bin/grass
+usr/share/man/man1/grass64.1.gz usr/share/man/man1/grass.1.gz
+usr/share/man/man1/grass64.1.gz usr/share/man/man1/x-grass.1.gz
diff --git a/debian/grass-core.manpages b/debian/grass-core.manpages
new file mode 100644
index 0000000..803c4fa
--- /dev/null
+++ b/debian/grass-core.manpages
@@ -0,0 +1 @@
+debian/grass64.1
diff --git a/debian/grass-core.manpages.in b/debian/grass-core.manpages.in
new file mode 100644
index 0000000..0e93ab8
--- /dev/null
+++ b/debian/grass-core.manpages.in
@@ -0,0 +1 @@
+debian/grass at VERSION@.1

-- 
Geographic Resources Analysis Support System