[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8

Francesco Paolo Lovergine frankie at debian.org
Wed May 25 16:04:42 UTC 2011


The following commit has been merged in the master branch:
commit 34826d7c7415b4ae52dd0cb209dcff64c9e70711
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed May 25 13:24:28 2011 +0200

    Added AbstractNode.cpp still for cstddef inclusion.

diff --git a/debian/changelog b/debian/changelog
index 0658792..5b6cd53 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.cpp, Node.cpp, MonotoneChainBuilder.h patches to fix 
-    a missing header file inclusion in some files.
+  * Added Bintree.cpp, Node.cpp, MonotoneChainBuilder.h, AbstractNode.cpp 
+    patches to fix a missing header file inclusion in some files.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 25 May 2011 13:13:03 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 25 May 2011 13:23:46 +0200
 
 geos (3.2.2-1) unstable; urgency=low
 
diff --git a/debian/patches/AbstractNode.cpp b/debian/patches/AbstractNode.cpp
new file mode 100644
index 0000000..0b2a2d9
--- /dev/null
+++ b/debian/patches/AbstractNode.cpp
@@ -0,0 +1,12 @@
+Index: geos/source/index/strtree/AbstractNode.cpp
+===================================================================
+--- geos.orig/source/index/strtree/AbstractNode.cpp	2011-05-25 13:22:35.000000000 +0200
++++ geos/source/index/strtree/AbstractNode.cpp	2011-05-25 13:22:52.000000000 +0200
+@@ -18,6 +18,7 @@
+ 
+ #include <vector>
+ #include <cassert>
++#include <cstddef>
+ 
+ using namespace std;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e2d44b6..2aba345 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ Bintree.cpp
 Node.cpp
 Root.cpp
 MonotoneChainBuilder.h
+AbstractNode.cpp

-- 
Geometry engine for Geographic Information Systems



More information about the Pkg-grass-devel mailing list