[SCM] geos branch, upstream, updated. upstream/3.3.2-56-g722309c

Francesco Paolo Lovergine frankie at debian.org
Thu May 17 18:32:06 UTC 2012


The following commit has been merged in the upstream branch:
commit 0bf2e677899e9725e5f614e20021f16cd84abfa1
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed May 25 13:13:30 2011 +0200

    One more patch.

diff --git a/debian/changelog b/debian/changelog
index 5049b8c..0658792 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,10 +4,10 @@ geos (3.2.2-2) unstable; urgency=low
   * Fixed previous changelog entry.
   * Added CoordinateSequenceFactory.h patch to fix a missing declaration.
     (closes: #624949)
-  * Added Bintree.cppi and Node.cpp patch to fix a missing header 
-    file inclusion in some files.
+  * Added Bintree.cpp, Node.cpp, MonotoneChainBuilder.h patches to fix 
+    a missing header file inclusion in some files.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 24 May 2011 17:31:19 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 25 May 2011 13:13:03 +0200
 
 geos (3.2.2-1) unstable; urgency=low
 
diff --git a/debian/patches/MonotoneChainBuilder.h b/debian/patches/MonotoneChainBuilder.h
new file mode 100644
index 0000000..67ded19
--- /dev/null
+++ b/debian/patches/MonotoneChainBuilder.h
@@ -0,0 +1,21 @@
+Index: geos/source/headers/geos/index/chain/MonotoneChainBuilder.h
+===================================================================
+--- geos.orig/source/headers/geos/index/chain/MonotoneChainBuilder.h	2011-05-25 13:12:19.000000000 +0200
++++ geos/source/headers/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 49fdacb..e2d44b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ CoordinateSequenceFactory.h
 Bintree.cpp
 Node.cpp
 Root.cpp
+MonotoneChainBuilder.h

-- 
Geometry engine for Geographic Information Systems



More information about the Pkg-grass-devel mailing list