[SCM] geos branch, master, updated. upstream/3.2.2-33-g4d70d74

Francesco Paolo Lovergine frankie at debian.org
Wed Nov 30 15:52:16 UTC 2011


The following commit has been merged in the master branch:
commit 4d70d7426fefbd099ebe4e25420a7af31c8ded37
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Mon Jul 18 13:55:44 2011 +0200

    Fixed syntax

diff --git a/debian/patches/swig b/debian/patches/swig
index 80e703b..8f7c59c 100644
--- a/debian/patches/swig
+++ b/debian/patches/swig
@@ -1,7 +1,7 @@
 Index: geos/macros/ac_pkg_swig.m4
 ===================================================================
---- geos.orig/macros/ac_pkg_swig.m4	2011-07-18 12:57:26.000000000 +0200
-+++ geos/macros/ac_pkg_swig.m4	2011-07-18 13:15:30.000000000 +0200
+--- geos.orig/macros/ac_pkg_swig.m4	2011-07-18 13:20:22.000000000 +0200
++++ geos/macros/ac_pkg_swig.m4	2011-07-18 13:54:31.000000000 +0200
 @@ -24,6 +24,9 @@
  dnl @author Andrew Collier <abcollier at yahoo.com>
  dnl @version 2004-09-20
@@ -27,8 +27,8 @@ Index: geos/macros/ac_pkg_swig.m4
                          else
 Index: geos/configure
 ===================================================================
---- geos.orig/configure	2011-07-18 13:15:37.000000000 +0200
-+++ geos/configure	2011-07-18 13:16:40.000000000 +0200
+--- geos.orig/configure	2011-07-18 13:20:22.000000000 +0200
++++ geos/configure	2011-07-18 13:55:27.000000000 +0200
 @@ -16544,9 +16544,9 @@
                          if test -z "$available_patch" ; then
                                  available_patch=0
@@ -36,8 +36,8 @@ Index: geos/configure
 -                        if test $available_major -ne $required_major \
 -                                -o $available_minor -ne $required_minor \
 -                                -o $available_patch -lt $required_patch ; then
-+			            [required_full=`printf %2.2d%2.2d%2.2d%2.2d $required_major $required_minor $required_patch]`
-+			            [available_full=`printf %2.2d%2.2d%2.2d%2.2d $available_major $available_minor $available_patch]`
++			            required_full=`printf %2.2d%2.2d%2.2d%2.2d $required_major $required_minor $required_patch`
++			            available_full=`printf %2.2d%2.2d%2.2d%2.2d $available_major $available_minor $available_patch`
 +                        if test $available_full -lt $required_full; then
                                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.28 is required.  You have $swig_version.  You should look at http://www.swig.org" >&5
  $as_echo "$as_me: WARNING: SWIG version >= 1.3.28 is required.  You have $swig_version.  You should look at http://www.swig.org" >&2;}

-- 
Geometry engine for Geographic Information Systems



More information about the Pkg-grass-devel mailing list