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

Francesco Paolo Lovergine frankie at debian.org
Thu May 17 18:31:57 UTC 2012


The following commit has been merged in the upstream branch:
commit 4e1cae72009062df24c01fe121e1fb65c0d881d0
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue May 24 17:08:08 2011 +0200

    Fixed another FTBS in current GCC.

diff --git a/debian/changelog b/debian/changelog
index 7806e54..1b14516 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ 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 patch to fix a missing header file inclusion.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 24 May 2011 15:52:18 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 24 May 2011 17:07:20 +0200
 
 geos (3.2.2-1) unstable; urgency=low
 
diff --git a/debian/patches/Bintree.cpp b/debian/patches/Bintree.cpp
new file mode 100644
index 0000000..dd93150
--- /dev/null
+++ b/debian/patches/Bintree.cpp
@@ -0,0 +1,12 @@
+Index: geos/source/index/bintree/Bintree.cpp
+===================================================================
+--- geos.orig/source/index/bintree/Bintree.cpp	2011-05-24 17:06:29.000000000 +0200
++++ geos/source/index/bintree/Bintree.cpp	2011-05-24 17:07:06.000000000 +0200
+@@ -18,6 +18,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/series b/debian/patches/series
index c0bb399..a935e1b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 CoordinateSequenceFactory.h
+Bintree.cpp

-- 
Geometry engine for Geographic Information Systems



More information about the Pkg-grass-devel mailing list