[SCM] grass branch, master, updated. upstream/6.4.1-123-g45a1edf
M. Hamish Bowman
hamish_b at yahoo.com
Wed Sep 11 09:06:29 UTC 2013
The following commit has been merged in the master branch:
commit 45a1edfd95de061ec2df5cc21693297edbe7d5a8
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date: Wed Sep 11 21:05:55 2013 +1200
autoconf isn't run by rules, so patch configure too
diff --git a/debian/patches/svn-any-version b/debian/patches/svn-any-version
index 681675a..c37d578 100644
--- a/debian/patches/svn-any-version
+++ b/debian/patches/svn-any-version
@@ -11,3 +11,16 @@ Index: grass/configure.in
GRASS_VERSION_SVN=
fi
fi
+Index: grass/configure
+===================================================================
+--- grass.orig/configure
++++ grass/configure
+@@ -1313,7 +1313,7 @@ fi
+
+ 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
More information about the Pkg-grass-devel
mailing list