[SCM] grass branch, master, updated. upstream/6.4.1-121-gabf5aac

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit abf5aacc0f86043b950fc9258af750441bc08ba8
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Tue Sep 10 18:35:11 2013 +1200

    Subversion 1.7 changed strings on us, adjust tests to match new behaviour (grass ticket #587)

diff --git a/debian/patches/series b/debian/patches/series
index ee9d410..88de269 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ xterm
 instdir
 check4dev
 barscale_ui
+svn-any-version
diff --git a/debian/patches/svn-any-version b/debian/patches/svn-any-version
new file mode 100644
index 0000000..681675a
--- /dev/null
+++ b/debian/patches/svn-any-version
@@ -0,0 +1,13 @@
+Index: grass/configure.in
+===================================================================
+--- grass.orig/configure.in
++++ grass/configure.in
+@@ -130,7 +130,7 @@
+ AC_PATH_PROG(SVN_VERSION, svnversion, no)
+ if test "$SVN_VERSION" != "no" ; then
+    GRASS_VERSION_SVN=`$SVN_VERSION -c | cut -f2 -d:`
+-   if test "$GRASS_VERSION_SVN" = "exported" ; then
++   if test "$GRASS_VERSION_SVN" = "exported" -o "$GRASS_VERSION_SVN" = "Unversioned directory" ; then
+       GRASS_VERSION_SVN=
+    fi
+ fi

-- 
Geographic Resources Analysis Support System