[DebianGIS-dev] r700 - packages/grass/trunk/debian/patches

[Francesco Lovergine]

Author: frankie
Date: 2007-04-04 13:15:07 +0000 (Wed, 04 Apr 2007)
New Revision: 700

Modified:
   packages/grass/trunk/debian/patches/pager.dpatch
   packages/grass/trunk/debian/patches/www-browser.dpatch
Log:
New patches revised.


Modified: packages/grass/trunk/debian/patches/pager.dpatch
===================================================================
--- packages/grass/trunk/debian/patches/pager.dpatch	2007-04-04 13:04:38 UTC (rev 699)
+++ packages/grass/trunk/debian/patches/pager.dpatch	2007-04-04 13:15:07 UTC (rev 700)
@@ -6,15 +6,20 @@
 
 @DPATCH@
 diff -urNad grass-6.2.1~/lib/init/init.sh grass-6.2.1/lib/init/init.sh
---- grass-6.2.1~/lib/init/init.sh	2007-04-02 23:39:53.000000000 +0200
-+++ grass-6.2.1/lib/init/init.sh	2007-04-02 23:41:37.000000000 +0200
-@@ -173,6 +173,9 @@
+--- grass-6.2.1~/lib/init/init.sh	2007-04-04 15:12:40.000000000 +0200
++++ grass-6.2.1/lib/init/init.sh	2007-04-04 15:14:27.000000000 +0200
+@@ -173,10 +173,12 @@
  
  # Set some environment variables if they are not set
  if [ ! "$GRASS_PAGER" ] ; then
+-    if [ -x /bin/more ] || [ -x /usr/bin/more ] ; then
+-        GRASS_PAGER=more
 +    if [ -x /usr/bin/pager ] ; then
 +    	GRASS_PAGER=pager
-+    elif
-     if [ -x /bin/more ] || [ -x /usr/bin/more ] ; then
-         GRASS_PAGER=more
      elif [ -x /bin/less ] || [ -x /usr/bin/less ] ; then
+         GRASS_PAGER=less
++    elif [ -x /bin/more ] || [ -x /usr/bin/more ] ; then
++        GRASS_PAGER=more
+     else
+         GRASS_PAGER=cat
+     fi

Modified: packages/grass/trunk/debian/patches/www-browser.dpatch
===================================================================
--- packages/grass/trunk/debian/patches/www-browser.dpatch	2007-04-04 13:04:38 UTC (rev 699)
+++ packages/grass/trunk/debian/patches/www-browser.dpatch	2007-04-04 13:15:07 UTC (rev 700)
@@ -7,8 +7,8 @@
 @DPATCH@
 diff -urNad grass-6.2.1~/lib/init/init.sh grass-6.2.1/lib/init/init.sh
 --- grass-6.2.1~/lib/init/init.sh	2006-10-19 13:20:41.000000000 +0200
-+++ grass-6.2.1/lib/init/init.sh	2007-03-30 15:54:31.000000000 +0200
-@@ -228,53 +228,7 @@
++++ grass-6.2.1/lib/init/init.sh	2007-04-04 15:12:17.000000000 +0200
+@@ -228,53 +228,11 @@
  CYGWIN=`uname | grep CYGWIN`
  
  if [ ! "$GRASS_HTML_BROWSER" ] ; then
@@ -59,7 +59,11 @@
 -    echo "Searching for web browser, but neither konqueror, nor mozilla, opera, netscape found."
 -    # so we set konqueror, though, to make lib/gis/parser.c happy:
 -    GRASS_HTML_BROWSER=konqueror
-+	GRASS_HTML_BROWSER=x-www-browser
++	if [ -x /usr/bin/x-www-browser ] ; then
++		GRASS_HTML_BROWSER=x-www-browser
++	elif 
++		GRASS_HTML_BROWSER=true
++	fi
  fi
  export GRASS_HTML_BROWSER