[SCM] grass branch, master, updated. upstream/6.4.1-64-gfa49ad5

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit fa49ad5db8c1c1b9083e4a6c4a128362cb820eaf
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Sat Feb 25 22:11:11 2012 +1300

    Use xdg-open for GRASS_HTML_BROWSER when available (patch from Thibault Lemaitre; closes #615667)

diff --git a/debian/changelog b/debian/changelog
index 1da0ad1..baa7b84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ grass (6.4.2-1) unstable; urgency=low
   * Patch g.extension.sh to check for the needed grass-dev package.
   * Remove outdated cruft from debian/fixscripts.sh and debian/rules.
   * libmysqlclient-dev replaces libmysqlclient15-dev (closes #650361)
+  * Use xdg-open for GRASS_HTML_BROWSER when available (closes #615667)
 
- -- M. Hamish Bowman <hamish_b at yahoo.com>  Thu, 23 Feb 2012 19:09:32 +1300
+ -- M. Hamish Bowman <hamish_b at yahoo.com>  Sat, 25 Feb 2012 22:09:50 +1300
 
 grass (6.4.1-2) unstable; urgency=low
 
diff --git a/debian/patches/www-browser b/debian/patches/www-browser
index e814734..ef5f0f2 100644
--- a/debian/patches/www-browser
+++ b/debian/patches/www-browser
@@ -38,7 +38,9 @@ Index: grass/lib/init/init.sh
 -	done
 -	if [ -n "$GRASS_HTML_BROWSER" ] ; then
 -	   break
-+	if [ -x /usr/bin/x-www-browser ] ; then
++	if [ -x /usr/bin/xdg-open ] ; then
++		GRASS_HTML_BROWSER=xdg-open
++	elif [ -x /usr/bin/x-www-browser ] ; then
 +		GRASS_HTML_BROWSER=x-www-browser
 +	else 
 +		GRASS_HTML_BROWSER=true

-- 
Geographic Resources Analysis Support System