The following commit has been merged in the upstream branch: commit bf8aa9fa8323c141cdb6c5900a9c4e641f3bee3f Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Fri Dec 2 15:43:49 2011 +0100
Removing superfluous patches diff --git a/debian/changelog b/debian/changelog index c2d1663..9219115 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,9 +4,9 @@ geos (3.3.1-4) unstable; urgency=low (closes: #648611) * Changed the C/C++ chain for development. See NEWS file for an explanation. (closes: #643658) - * Patches refreshed. + * Patches refreshed and merged with upstream changes. - -- Francesco Paolo Lovergine <fran...@debian.org> Fri, 02 Dec 2011 14:41:49 +0100 + -- Francesco Paolo Lovergine <fran...@debian.org> Fri, 02 Dec 2011 15:43:28 +0100 geos (3.2.2-3) unstable; urgency=low diff --git a/debian/patches/AbstractNode.cpp b/debian/patches/AbstractNode.cpp deleted file mode 100644 index 0c4a61a..0000000 --- a/debian/patches/AbstractNode.cpp +++ /dev/null @@ -1,12 +0,0 @@ -Index: geos/src/index/strtree/AbstractNode.cpp -=================================================================== ---- geos.orig/src/index/strtree/AbstractNode.cpp 2011-11-30 16:54:52.000000000 +0100 -+++ geos/src/index/strtree/AbstractNode.cpp 2011-12-02 14:40:01.000000000 +0100 -@@ -19,6 +19,7 @@ - #include <vector> - #include <cstddef> - #include <cassert> -+#include <cstddef> - - using namespace std; - diff --git a/debian/patches/Bintree.cpp b/debian/patches/Bintree.cpp deleted file mode 100644 index 118c15b..0000000 --- a/debian/patches/Bintree.cpp +++ /dev/null @@ -1,12 +0,0 @@ -Index: geos/src/index/bintree/Bintree.cpp -=================================================================== ---- geos.orig/src/index/bintree/Bintree.cpp 2011-11-30 16:54:52.000000000 +0100 -+++ geos/src/index/bintree/Bintree.cpp 2011-12-02 14:35:52.000000000 +0100 -@@ -19,6 +19,7 @@ - #include <geos/index/bintree/Root.h> - #include <geos/index/bintree/Interval.h> - #include <vector> -+#include <cstddef> - - namespace geos { - namespace index { // geos.index diff --git a/debian/patches/MonotoneChainBuilder.h b/debian/patches/MonotoneChainBuilder.h deleted file mode 100644 index 9878afa..0000000 --- a/debian/patches/MonotoneChainBuilder.h +++ /dev/null @@ -1,21 +0,0 @@ -Index: geos/include/geos/index/chain/MonotoneChainBuilder.h -=================================================================== ---- geos.orig/include/geos/index/chain/MonotoneChainBuilder.h 2011-05-25 13:12:19.000000000 +0200 -+++ geos/include/geos/index/chain/MonotoneChainBuilder.h 2011-05-25 13:12:35.000000000 +0200 -@@ -22,6 +22,7 @@ - - #include <geos/export.h> - #include <vector> -+#include <cstddef> - - // Forward declarations - namespace geos { -@@ -39,6 +40,8 @@ - namespace index { // geos::index - namespace chain { // geos::index::chain - -+using namespace std; -+ - /** \brief - * Constructs {@link MonotoneChain}s - * for sequences of {@link Coordinate}s. diff --git a/debian/patches/series b/debian/patches/series index 0849f79..a9214bf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,13 +1,9 @@ CoordinateSequenceFactory.h -Bintree.cpp Node.cpp Root.cpp -#MonotoneChainBuilder.h -AbstractNode.cpp SimpleNestedRingTester.h DirectedEdgeStar.h DouglasPeuckerLineSimplifier.h TaggedLineString.cpp TaggedLineString.h TaggedLineStringSimplifier.h -#swig diff --git a/debian/patches/swig b/debian/patches/swig deleted file mode 100644 index 8f7c59c..0000000 --- a/debian/patches/swig +++ /dev/null @@ -1,44 +0,0 @@ -Index: geos/macros/ac_pkg_swig.m4 -=================================================================== ---- 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 <abcoll...@yahoo.com> - 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/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 - 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