The following commit has been merged in the master branch:
commit 20856e6ef8e3b5ae2ee1faebcb6b3d1b78a1f136
Author: Francesco Paolo Lovergine
Date: Mon Jul 18 13:20:32 2011 +0200
Applying the previous patch to the current configure :)
diff --git a/debian/patches/swig b/debian/patches/swig
index f326d58..80e703b 100644
--- a/debian/patches/swig
+++ b/debian/patches/swig
@@ -1,23 +1,44 @@
-Index: trunk/macros/ac_pkg_swig.m4
-===
trunk/macros/ac_pkg_swig.m4(revision 2013)
-+++ trunk/macros/ac_pkg_swig.m4(revision 3000)
-@@ -25,4 +25,7 @@
- dnl @version 2004-09-20
- dnl @license GPLWithACException
-+dnl
-+dnl Fixed by Sandro Santilli to consider 2.0.0 > 1.3.37 (2010-06-15)
-+dnl
-
- AC_DEFUN([AC_PROG_SWIG],[
-@@ -68,7 +71,7 @@
- [available_patch=0]
- fi
--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]`
-+if test $available_full -lt $required_full; then
- AC_MSG_WARN([SWIG version >= $1 is required.
You have $swig_version. You should look at http://www.swig.org])
- SWIG=''
+Index: geos/macros/ac_pkg_swig.m4
+===
+--- geos.orig/macros/ac_pkg_swig.m42011-07-18 12:57:26.0 +0200
geos/macros/ac_pkg_swig.m4 2011-07-18 13:15:30.0 +0200
+@@ -24,6 +24,9 @@
+ dnl @author Andrew Collier
+ dnl @version 2004-09-20
+ dnl @license GPLWithACException
++dnl
++dnl Fixed by Sandro Santilli to consider 2.0.0 > 1.3.37 (2010-06-15)
++dnl
+
+ AC_DEFUN([AC_PROG_SWIG],[
+ AC_PATH_PROG([SWIG],[swig])
+@@ -67,9 +70,9 @@
+ if test -z "$available_patch" ; then
+ [available_patch=0]
+ fi
+-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]`
++if test $available_full -lt $required_full; then
+ AC_MSG_WARN([SWIG version >= $1 is required.
You have $swig_version. You should look at http://www.swig.org])
+ SWIG=''
+ else
+Index: geos/configure
+===
+--- geos.orig/configure2011-07-18 13:15:37.0 +0200
geos/configure 2011-07-18 13:16:40.0 +0200
+@@ -16544,9 +16544,9 @@
+ if test -z "$available_patch" ; then
+ available_patch=0
+ fi
+-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]`
++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;}
+ SWIG=''
--
Geometry engine for Geographic Information Systems
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
