The following commit has been merged in the upstream branch: commit abb70c74b157b68108e5cf85e4adef70a06f254a Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Fri Dec 2 14:42:06 2011 +0100
Refreshed patches. diff --git a/debian/changelog b/debian/changelog index 764f51a..c2d1663 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +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. - -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 30 Nov 2011 17:01:19 +0100 + -- Francesco Paolo Lovergine <fran...@debian.org> Fri, 02 Dec 2011 14:41:49 +0100 geos (3.2.2-3) unstable; urgency=low diff --git a/debian/patches/AbstractNode.cpp b/debian/patches/AbstractNode.cpp index 0b2a2d9..0c4a61a 100644 --- a/debian/patches/AbstractNode.cpp +++ b/debian/patches/AbstractNode.cpp @@ -1,10 +1,10 @@ -Index: geos/source/index/strtree/AbstractNode.cpp +Index: geos/src/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 @@ - +--- 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> diff --git a/debian/patches/Bintree.cpp b/debian/patches/Bintree.cpp index 801eb4d..118c15b 100644 --- a/debian/patches/Bintree.cpp +++ b/debian/patches/Bintree.cpp @@ -1,8 +1,8 @@ -Index: geos/source/index/bintree/Bintree.cpp +Index: geos/src/index/bintree/Bintree.cpp =================================================================== ---- geos.orig/source/index/bintree/Bintree.cpp 2011-05-25 12:56:17.000000000 +0200 -+++ geos/source/index/bintree/Bintree.cpp 2011-05-25 12:58:36.000000000 +0200 -@@ -18,6 +18,7 @@ +--- 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> diff --git a/debian/patches/CoordinateSequenceFactory.h b/debian/patches/CoordinateSequenceFactory.h index 90b8669..a5a8a29 100644 --- a/debian/patches/CoordinateSequenceFactory.h +++ b/debian/patches/CoordinateSequenceFactory.h @@ -1,7 +1,7 @@ -Index: geos/source/headers/geos/geom/CoordinateSequenceFactory.h +Index: geos/include/geos/geom/CoordinateSequenceFactory.h =================================================================== ---- geos.orig/source/headers/geos/geom/CoordinateSequenceFactory.h 2011-05-24 15:51:50.000000000 +0200 -+++ geos/source/headers/geos/geom/CoordinateSequenceFactory.h 2011-05-24 15:51:53.000000000 +0200 +--- geos.orig/include/geos/geom/CoordinateSequenceFactory.h 2011-05-24 15:51:50.000000000 +0200 ++++ geos/include/geos/geom/CoordinateSequenceFactory.h 2011-05-24 15:51:53.000000000 +0200 @@ -24,7 +24,7 @@ #include <geos/export.h> #include <vector> diff --git a/debian/patches/DirectedEdgeStar.h b/debian/patches/DirectedEdgeStar.h index 5422464..8221a4b 100644 --- a/debian/patches/DirectedEdgeStar.h +++ b/debian/patches/DirectedEdgeStar.h @@ -1,16 +1,16 @@ -Index: geos/source/headers/geos/planargraph/DirectedEdgeStar.h +Index: geos/include/geos/planargraph/DirectedEdgeStar.h =================================================================== ---- geos.orig/source/headers/geos/planargraph/DirectedEdgeStar.h 2011-05-25 15:32:28.000000000 +0200 -+++ geos/source/headers/geos/planargraph/DirectedEdgeStar.h 2011-05-25 15:33:06.000000000 +0200 +--- geos.orig/include/geos/planargraph/DirectedEdgeStar.h 2011-11-30 16:54:52.000000000 +0100 ++++ geos/include/geos/planargraph/DirectedEdgeStar.h 2011-12-02 14:40:45.000000000 +0100 @@ -20,6 +20,7 @@ #include <geos/export.h> #include <vector> +#include <cstddef> - // Forward declarations - namespace geos { -@@ -35,6 +36,8 @@ + #ifdef _MSC_VER + #pragma warning(push) +@@ -40,6 +41,8 @@ namespace geos { namespace planargraph { // geos.planargraph diff --git a/debian/patches/DouglasPeuckerLineSimplifier.h b/debian/patches/DouglasPeuckerLineSimplifier.h index 3396826..15caa11 100644 --- a/debian/patches/DouglasPeuckerLineSimplifier.h +++ b/debian/patches/DouglasPeuckerLineSimplifier.h @@ -1,16 +1,16 @@ -Index: geos/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h +Index: geos/include/geos/simplify/DouglasPeuckerLineSimplifier.h =================================================================== ---- geos.orig/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h 2011-05-25 16:11:31.000000000 +0200 -+++ geos/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h 2011-05-25 16:12:10.000000000 +0200 +--- geos.orig/include/geos/simplify/DouglasPeuckerLineSimplifier.h 2011-11-30 16:54:52.000000000 +0100 ++++ geos/include/geos/simplify/DouglasPeuckerLineSimplifier.h 2011-12-02 14:40:59.000000000 +0100 @@ -23,6 +23,7 @@ #include <geos/export.h> #include <vector> #include <memory> // for auto_ptr +#include <cstddef> - // Forward declarations - namespace geos { -@@ -34,6 +35,8 @@ + #ifdef _MSC_VER + #pragma warning(push) +@@ -39,6 +40,8 @@ namespace geos { namespace simplify { // geos::simplify diff --git a/debian/patches/MonotoneChainBuilder.h b/debian/patches/MonotoneChainBuilder.h index 67ded19..9878afa 100644 --- a/debian/patches/MonotoneChainBuilder.h +++ b/debian/patches/MonotoneChainBuilder.h @@ -1,7 +1,7 @@ -Index: geos/source/headers/geos/index/chain/MonotoneChainBuilder.h +Index: geos/include/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 +--- 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> diff --git a/debian/patches/Node.cpp b/debian/patches/Node.cpp index 5d1b30c..7b16feb 100644 --- a/debian/patches/Node.cpp +++ b/debian/patches/Node.cpp @@ -1,16 +1,16 @@ -Index: geos/source/index/bintree/Node.cpp +Index: geos/src/index/bintree/Node.cpp =================================================================== ---- geos.orig/source/index/bintree/Node.cpp 2011-05-25 12:56:17.000000000 +0200 -+++ geos/source/index/bintree/Node.cpp 2011-05-25 12:58:49.000000000 +0200 -@@ -15,6 +15,7 @@ - **********************************************************************/ +--- geos.orig/src/index/bintree/Node.cpp 2011-11-30 16:54:52.000000000 +0100 ++++ geos/src/index/bintree/Node.cpp 2011-12-02 14:36:08.000000000 +0100 +@@ -16,6 +16,7 @@ + #include <cstddef> #include <cassert> +#include <cstddef> #include <geos/index/bintree/Node.h> #include <geos/index/bintree/Key.h> -@@ -24,6 +25,8 @@ +@@ -25,6 +26,8 @@ namespace index { // geos.index namespace bintree { // geos.index.bintree @@ -19,11 +19,11 @@ Index: geos/source/index/bintree/Node.cpp Node* Node::createNode(Interval *itemInterval) { -Index: geos/source/geomgraph/Node.cpp +Index: geos/src/geomgraph/Node.cpp =================================================================== ---- geos.orig/source/geomgraph/Node.cpp 2011-05-25 12:56:17.000000000 +0200 -+++ geos/source/geomgraph/Node.cpp 2011-05-25 13:00:59.000000000 +0200 -@@ -30,6 +30,7 @@ +--- geos.orig/src/geomgraph/Node.cpp 2011-11-30 16:54:52.000000000 +0100 ++++ geos/src/geomgraph/Node.cpp 2011-12-02 14:36:08.000000000 +0100 +@@ -32,6 +32,7 @@ #include <sstream> #include <vector> #include <algorithm> @@ -31,7 +31,7 @@ Index: geos/source/geomgraph/Node.cpp #ifndef GEOS_DEBUG #define GEOS_DEBUG 0 -@@ -38,12 +39,13 @@ +@@ -40,12 +41,13 @@ #define COMPUTE_Z 1 #endif @@ -46,10 +46,10 @@ Index: geos/source/geomgraph/Node.cpp /*public*/ Node::Node(const Coordinate& newCoord, EdgeEndStar* newEdges) : -Index: geos/source/index/quadtree/Node.cpp +Index: geos/src/index/quadtree/Node.cpp =================================================================== ---- geos.orig/source/index/quadtree/Node.cpp 2011-05-25 12:56:17.000000000 +0200 -+++ geos/source/index/quadtree/Node.cpp 2011-05-25 13:02:00.000000000 +0200 +--- geos.orig/src/index/quadtree/Node.cpp 2011-11-30 16:54:52.000000000 +0100 ++++ geos/src/index/quadtree/Node.cpp 2011-12-02 14:36:08.000000000 +0100 @@ -25,6 +25,7 @@ #include <string> #include <sstream> diff --git a/debian/patches/Root.cpp b/debian/patches/Root.cpp index 17e4642..88d6635 100644 --- a/debian/patches/Root.cpp +++ b/debian/patches/Root.cpp @@ -1,10 +1,10 @@ -Index: geos/source/index/bintree/Root.cpp +Index: geos/src/index/bintree/Root.cpp =================================================================== ---- geos.orig/source/index/bintree/Root.cpp 2011-05-25 13:02:47.000000000 +0200 -+++ geos/source/index/bintree/Root.cpp 2011-05-25 13:03:44.000000000 +0200 -@@ -20,11 +20,14 @@ - #include <geos/index/quadtree/IntervalSize.h> +--- geos.orig/src/index/bintree/Root.cpp 2011-11-30 16:54:52.000000000 +0100 ++++ geos/src/index/bintree/Root.cpp 2011-12-02 14:36:34.000000000 +0100 +@@ -21,11 +21,14 @@ + #include <cstddef> #include <cassert> +#include <cstddef> @@ -17,10 +17,10 @@ Index: geos/source/index/bintree/Root.cpp double Root::origin=0.0; void -Index: geos/source/index/quadtree/Root.cpp +Index: geos/src/index/quadtree/Root.cpp =================================================================== ---- geos.orig/source/index/quadtree/Root.cpp 2011-05-25 13:02:47.000000000 +0200 -+++ geos/source/index/quadtree/Root.cpp 2011-05-25 13:03:17.000000000 +0200 +--- geos.orig/src/index/quadtree/Root.cpp 2011-11-30 16:54:52.000000000 +0100 ++++ geos/src/index/quadtree/Root.cpp 2011-12-02 14:36:34.000000000 +0100 @@ -25,6 +25,7 @@ #include <geos/geom/Envelope.h> diff --git a/debian/patches/SimpleNestedRingTester.h b/debian/patches/SimpleNestedRingTester.h index 77b49d4..5375c39 100644 --- a/debian/patches/SimpleNestedRingTester.h +++ b/debian/patches/SimpleNestedRingTester.h @@ -1,16 +1,16 @@ -Index: geos/source/headers/geos/operation/valid/SimpleNestedRingTester.h +Index: geos/include/geos/operation/valid/SimpleNestedRingTester.h =================================================================== ---- geos.orig/source/headers/geos/operation/valid/SimpleNestedRingTester.h 2011-05-25 15:10:53.000000000 +0200 -+++ geos/source/headers/geos/operation/valid/SimpleNestedRingTester.h 2011-05-25 15:11:11.000000000 +0200 -@@ -24,6 +24,7 @@ - #include <geos/export.h> +--- geos.orig/include/geos/operation/valid/SimpleNestedRingTester.h 2011-11-30 16:54:52.000000000 +0100 ++++ geos/include/geos/operation/valid/SimpleNestedRingTester.h 2011-12-02 14:40:21.000000000 +0100 +@@ -25,6 +25,7 @@ + #include <cstddef> #include <vector> +#include <cstddef> - // Forward declarations - namespace geos { -@@ -40,6 +41,8 @@ + #ifdef _MSC_VER + #pragma warning(push) +@@ -46,6 +47,8 @@ namespace operation { // geos::operation namespace valid { // geos::operation::valid diff --git a/debian/patches/TaggedLineString.cpp b/debian/patches/TaggedLineString.cpp index 8749ddb..38faa85 100644 --- a/debian/patches/TaggedLineString.cpp +++ b/debian/patches/TaggedLineString.cpp @@ -1,7 +1,7 @@ -Index: geos/source/simplify/TaggedLineString.cpp +Index: geos/src/simplify/TaggedLineString.cpp =================================================================== ---- geos.orig/source/simplify/TaggedLineString.cpp 2011-05-25 17:04:12.000000000 +0200 -+++ geos/source/simplify/TaggedLineString.cpp 2011-05-25 17:04:31.000000000 +0200 +--- geos.orig/src/simplify/TaggedLineString.cpp 2011-11-30 16:54:52.000000000 +0100 ++++ geos/src/simplify/TaggedLineString.cpp 2011-12-02 14:41:08.000000000 +0100 @@ -27,6 +27,7 @@ #include <cassert> @@ -18,4 +18,4 @@ Index: geos/source/simplify/TaggedLineString.cpp + /*public*/ TaggedLineString::TaggedLineString(const geom::LineString* nParentLine, - size_t nMinimumSize) + std::size_t nMinimumSize) diff --git a/debian/patches/TaggedLineString.h b/debian/patches/TaggedLineString.h index a84458e..37dbf5a 100644 --- a/debian/patches/TaggedLineString.h +++ b/debian/patches/TaggedLineString.h @@ -1,16 +1,16 @@ -Index: geos/source/headers/geos/simplify/TaggedLineString.h +Index: geos/include/geos/simplify/TaggedLineString.h =================================================================== ---- geos.orig/source/headers/geos/simplify/TaggedLineString.h 2011-05-25 17:49:06.000000000 +0200 -+++ geos/source/headers/geos/simplify/TaggedLineString.h 2011-05-25 17:49:28.000000000 +0200 +--- geos.orig/include/geos/simplify/TaggedLineString.h 2011-11-30 16:54:52.000000000 +0100 ++++ geos/include/geos/simplify/TaggedLineString.h 2011-12-02 14:41:17.000000000 +0100 @@ -29,6 +29,7 @@ #include <geos/export.h> #include <vector> #include <memory> +#include <cstddef> - // Forward declarations - namespace geos { -@@ -47,6 +48,7 @@ + #ifdef _MSC_VER + #pragma warning(push) +@@ -52,6 +53,7 @@ namespace geos { namespace simplify { // geos::simplify diff --git a/debian/patches/TaggedLineStringSimplifier.h b/debian/patches/TaggedLineStringSimplifier.h index 61cbb03..0e254d9 100644 --- a/debian/patches/TaggedLineStringSimplifier.h +++ b/debian/patches/TaggedLineStringSimplifier.h @@ -1,16 +1,16 @@ -Index: geos/source/headers/geos/simplify/TaggedLineStringSimplifier.h +Index: geos/include/geos/simplify/TaggedLineStringSimplifier.h =================================================================== ---- geos.orig/source/headers/geos/simplify/TaggedLineStringSimplifier.h 2011-05-25 17:59:12.000000000 +0200 -+++ geos/source/headers/geos/simplify/TaggedLineStringSimplifier.h 2011-05-25 17:59:30.000000000 +0200 -@@ -28,6 +28,7 @@ - #include <geos/export.h> +--- geos.orig/include/geos/simplify/TaggedLineStringSimplifier.h 2011-11-30 16:54:52.000000000 +0100 ++++ geos/include/geos/simplify/TaggedLineStringSimplifier.h 2011-12-02 14:41:32.000000000 +0100 +@@ -29,6 +29,7 @@ + #include <cstddef> #include <vector> #include <memory> +#include <cstddef> - // Forward declarations - namespace geos { -@@ -48,6 +49,7 @@ + #ifdef _MSC_VER + #pragma warning(push) +@@ -54,6 +55,7 @@ namespace geos { namespace simplify { // geos::simplify diff --git a/debian/patches/series b/debian/patches/series index 5f0826a..0849f79 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,7 +2,7 @@ CoordinateSequenceFactory.h Bintree.cpp Node.cpp Root.cpp -MonotoneChainBuilder.h +#MonotoneChainBuilder.h AbstractNode.cpp SimpleNestedRingTester.h DirectedEdgeStar.h @@ -10,4 +10,4 @@ DouglasPeuckerLineSimplifier.h TaggedLineString.cpp TaggedLineString.h TaggedLineStringSimplifier.h -swig +#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