[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8
The following commit has been merged in the master branch: commit 33da6af5100bcc38cfbae1cc777582712e7ec2fd Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Mar 3 13:13:14 2011 +0100 Get rid of lintian warning. diff --git a/debian/changelog b/debian/changelog index e3d9e1e..d69c757 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ geos (3.2.2-1) unstable; urgency=low * Repository moved to git and changed Vcs-* fields as required. * Source format moved to 3.0 with quilt support. * Policy changed to 3.9.1, without changes. + * Added ${misc:Depends} to bin pkgs due to dh use. -- Francesco Paolo Lovergine fran...@debian.org Wed, 02 Mar 2011 23:01:54 +0100 diff --git a/debian/control b/debian/control index 26775ef..3e81ec5 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Vcs-Git: git://git.debian.org/git/pkg-grass/geos Package: libgeos-dev Section: libdevel Architecture: any -Depends: libgeos-3.2.2 (= ${binary:Version}), libgeos-c1 (= ${binary:Version}) +Depends: libgeos-3.2.2 (= ${binary:Version}), libgeos-c1 (= ${binary:Version}), ${misc:Depends} Suggests: libgdal-doc Description: Geometry engine for GIS - Development files GEOS provides a spatial object model and fundamental geometric @@ -68,6 +68,7 @@ Description: Geometry engine for Geographic Information Systems - C++ Library Package: libgeos-doc Section: doc Architecture: all +Depends: ${misc:Depends} Suggests: libgeos-dev (= ${binary:Version}) Homepage: http://download.osgeo.org/geos/doxygen/ Description: Documentation for the GEOS GIS geometry engine library diff --git a/debian/control.in b/debian/control.in index d9e47e8..f391f89 100644 --- a/debian/control.in +++ b/debian/control.in @@ -13,7 +13,7 @@ Vcs-Git: git://git.debian.org/git/pkg-grass/geos Package: libgeos-dev Section: libdevel Architecture: any -Depends: libgeos-@VERSION@ (= ${binary:Version}), libgeos-c1 (= ${binary:Version}) +Depends: libgeos-@VERSION@ (= ${binary:Version}), libgeos-c1 (= ${binary:Version}), ${misc:Depends} Suggests: libgdal-doc Description: Geometry engine for GIS - Development files GEOS provides a spatial object model and fundamental geometric @@ -68,6 +68,7 @@ Description: Geometry engine for Geographic Information Systems - C++ Library Package: libgeos-doc Section: doc Architecture: all +Depends: ${misc:Depends} Suggests: libgeos-dev (= ${binary:Version}) Homepage: http://download.osgeo.org/geos/doxygen/ Description: Documentation for the GEOS GIS geometry engine library -- 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
[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8
The following commit has been merged in the master branch: commit ef0c1d5f0b1c085688f7e4f7533ce6ec65b8d7c0 Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Mar 3 14:46:33 2011 +0100 Fixed for missing ${misc:Depends} diff --git a/debian/control b/debian/control index 5bcb34a..82bd00f 100644 --- a/debian/control +++ b/debian/control @@ -93,7 +93,7 @@ Package: libgeos-dbg Architecture: any Section: debug Priority: extra -Depends: libgeos-3.2.2 (= ${binary:Version}), libgeos-c1 (= ${binary:Version}) +Depends: libgeos-3.2.2 (= ${binary:Version}), libgeos-c1 (= ${binary:Version}), ${misc:Depends} Description: Debugging symbols for the GEOS library GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the diff --git a/debian/control.in b/debian/control.in index 1eb3ac1..e328330 100644 --- a/debian/control.in +++ b/debian/control.in @@ -93,7 +93,7 @@ Package: libgeos-dbg Architecture: any Section: debug Priority: extra -Depends: libgeos-@VERSION@ (= ${binary:Version}), libgeos-c1 (= ${binary:Version}) +Depends: libgeos-@VERSION@ (= ${binary:Version}), libgeos-c1 (= ${binary:Version}), ${misc:Depends} Description: Debugging symbols for the GEOS library GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the -- 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
[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8
The following commit has been merged in the master branch: commit 29536deca7b6b5a6257c544e7f5a6b7b87818d68 Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue May 24 15:53:42 2011 +0200 Fixating #624949 diff --git a/debian/changelog b/debian/changelog index ccb43b1..7806e54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +geos (3.2.2-2) unstable; urgency=low + + * Policy bumped to 3.9.2, no changes. + * Fixed previous changelog entry. + * Added CoordinateSequenceFactory.h patch to fix a missing declaration. +(closes: #624949) + + -- Francesco Paolo Lovergine fran...@debian.org Tue, 24 May 2011 15:52:18 +0200 + geos (3.2.2-1) unstable; urgency=low [ Alan Boudreault ] @@ -8,7 +17,6 @@ geos (3.2.2-1) unstable; urgency=low * Merged log for post squeeze release. * Repository moved to git and changed Vcs-* fields as required. * Source format moved to 3.0 with quilt support. - * Policy changed to 3.9.1, without changes. * Added ${misc:Depends} to bin pkgs due to dh use. * Added -dbg package for debugging symbols. (closes: #582273) diff --git a/debian/compat b/debian/compat index 7f8f011..45a4fb7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +8 diff --git a/debian/control b/debian/control index 82bd00f..c820c9d 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,9 @@ Section: science Priority: optional Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org -Build-Depends: debhelper (= 7), doxygen, swig, ruby, ruby-dev, +Build-Depends: debhelper (= 8), doxygen, swig, ruby, ruby-dev, python-all, python-all-dev, python-central (= 0.5) -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: http://trac.osgeo.org/geos/ Vcs-Browser: http://git.debian.org/?p=pkg-grass/geos.git Vcs-Git: git://git.debian.org/git/pkg-grass/geos diff --git a/debian/control.in b/debian/control.in index e328330..5784870 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,9 +3,9 @@ Section: science Priority: optional Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org -Build-Depends: debhelper (= 7), doxygen, swig, ruby, ruby-dev, +Build-Depends: debhelper (= 8), doxygen, swig, ruby, ruby-dev, python-all, python-all-dev, python-central (= 0.5) -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: http://trac.osgeo.org/geos/ Vcs-Browser: http://git.debian.org/?p=pkg-grass/geos.git Vcs-Git: git://git.debian.org/git/pkg-grass/geos diff --git a/debian/patches/CoordinateSequenceFactory.h b/debian/patches/CoordinateSequenceFactory.h new file mode 100644 index 000..90b8669 --- /dev/null +++ b/debian/patches/CoordinateSequenceFactory.h @@ -0,0 +1,13 @@ +Index: geos/source/headers/geos/geom/CoordinateSequenceFactory.h +=== +--- geos.orig/source/headers/geos/geom/CoordinateSequenceFactory.h 2011-05-24 15:51:50.0 +0200 geos/source/headers/geos/geom/CoordinateSequenceFactory.h 2011-05-24 15:51:53.0 +0200 +@@ -24,7 +24,7 @@ + #include geos/export.h + #include vector + +-//#include geos/geom/Coordinate.h ++#include geos/geom/Coordinate.h + #include geos/inline.h + + // Forward declarations diff --git a/debian/patches/series b/debian/patches/series index e69de29..c0bb399 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +CoordinateSequenceFactory.h -- 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
[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8
The following commit has been merged in the master branch: commit f2d1d8d2a7917c4108ee708e9ed4ba90ced86e3e Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue May 24 17:31:54 2011 +0200 Fixed again FTBS for missing NULL decl. diff --git a/debian/changelog b/debian/changelog index 1b14516..5049b8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,9 +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 patch to fix a missing header file inclusion. + * Added Bintree.cppi and Node.cpp patch to fix a missing header +file inclusion in some files. - -- Francesco Paolo Lovergine fran...@debian.org Tue, 24 May 2011 17:07:20 +0200 + -- Francesco Paolo Lovergine fran...@debian.org Tue, 24 May 2011 17:31:19 +0200 geos (3.2.2-1) unstable; urgency=low diff --git a/debian/patches/Node.cpp b/debian/patches/Node.cpp new file mode 100644 index 000..f514140 --- /dev/null +++ b/debian/patches/Node.cpp @@ -0,0 +1,111 @@ +Index: geos/source/index/bintree/Node.cpp +=== +--- geos.orig/source/index/bintree/Node.cpp2011-05-24 17:26:38.0 +0200 geos/source/index/bintree/Node.cpp 2011-05-24 17:27:28.0 +0200 +@@ -15,6 +15,7 @@ + **/ + + #include cassert ++#include cstddef + + #include geos/index/bintree/Node.h + #include geos/index/bintree/Key.h +@@ -38,9 +39,9 @@ + Node::createExpanded(Node *node,Interval *addInterval) + { + Interval *expandInt=new Interval(addInterval); +- if (node!=NULL) expandInt-expandToInclude(node-interval); ++ if (node!=std::NULL) expandInt-expandToInclude(node-interval); + Node *largerNode=createNode(expandInt); +- if (node!=NULL) largerNode-insert(node); ++ if (node!=std::NULL) largerNode-insert(node); + delete expandInt; + return largerNode; + } +@@ -99,7 +100,7 @@ + int subnodeIndex=getSubnodeIndex(searchInterval,centre); + if (subnodeIndex==-1) + return this; +- if (subnode[subnodeIndex]!=NULL) { ++ if (subnode[subnodeIndex]!=std::NULL) { + // query lies in subnode, so search it + Node *node=subnode[subnodeIndex]; + return node-find(searchInterval); +@@ -111,7 +112,7 @@ + void + Node::insert(Node *node) + { +- assert(interval==NULL || interval-contains(node-interval)); ++ assert(interval==std::NULL || interval-contains(node-interval)); + int index=getSubnodeIndex(node-interval,centre); + if (node-level==level-1) { + subnode[index]=node; +@@ -131,7 +132,7 @@ + Node* + Node::getSubnode(int index) + { +- if (subnode[index]==NULL) { ++ if (subnode[index]==std::NULL) { + subnode[index]=createSubnode(index); + } + return subnode[index]; +Index: geos/source/geomgraph/Node.cpp +=== +--- geos.orig/source/geomgraph/Node.cpp2011-05-24 17:29:37.0 +0200 geos/source/geomgraph/Node.cpp 2011-05-24 17:30:35.0 +0200 +@@ -30,6 +30,7 @@ + #include sstream + #include vector + #include algorithm ++#include cstddef + + #ifndef GEOS_DEBUG + #define GEOS_DEBUG 0 +@@ -178,7 +179,7 @@ + void + Node::setLabel(int argIndex, int onLocation) + { +- if (label==NULL) { ++ if (label==std::NULL) { + label=new Label(argIndex, onLocation); + } else + label-setLocation(argIndex, onLocation); +@@ -191,7 +192,7 @@ + Node::setLabelBoundary(int argIndex) + { + int loc=Location::UNDEF; +- if (label!=NULL) ++ if (label!=std::NULL) + loc=label-getLocation(argIndex); + // flip the loc + int newLoc; +Index: geos/source/index/quadtree/Node.cpp +=== +--- geos.orig/source/index/quadtree/Node.cpp 2011-05-24 17:28:56.0 +0200 geos/source/index/quadtree/Node.cpp2011-05-24 17:29:13.0 +0200 +@@ -25,6 +25,7 @@ + #include string + #include sstream + #include cassert ++#include cstddef + + #ifndef GEOS_DEBUG + #define GEOS_DEBUG 0 +@@ -103,7 +104,7 @@ + int subnodeIndex=getSubnodeIndex(searchEnv, centre); + if (subnodeIndex==-1) + return this; +- if (subnode[subnodeIndex]!=NULL) { ++ if (subnode[subnodeIndex]!=std::NULL) { + // query lies in subquad, so search it + Node *node=subnode[subnodeIndex]; + return node-find(searchEnv); +@@ -146,7 +147,7 @@ + Node::getSubnode(int index) + { + assert(index =0 index 4); +- if (subnode[index] == NULL) ++ if (subnode[index] == std::NULL) + { + subnode[index] =
[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8
The following commit has been merged in the master branch: commit 4e1cae72009062df24c01fe121e1fb65c0d881d0 Author: Francesco Paolo Lovergine fran...@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 fran...@debian.org Tue, 24 May 2011 15:52:18 +0200 + -- Francesco Paolo Lovergine fran...@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 000..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.0 +0200 geos/source/index/bintree/Bintree.cpp 2011-05-24 17:07:06.0 +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 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8
The following commit has been merged in the master branch: commit b8b8fc51f0b4ddeeb0def9854229836cc2a6e1d0 Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue May 24 17:56:45 2011 +0200 Fixed patch for missing qualiefier. diff --git a/debian/patches/Node.cpp b/debian/patches/Node.cpp index f514140..1f7876c 100644 --- a/debian/patches/Node.cpp +++ b/debian/patches/Node.cpp @@ -1,7 +1,7 @@ Index: geos/source/index/bintree/Node.cpp === geos.orig/source/index/bintree/Node.cpp2011-05-24 17:26:38.0 +0200 -+++ geos/source/index/bintree/Node.cpp 2011-05-24 17:27:28.0 +0200 +--- geos.orig/source/index/bintree/Node.cpp2011-05-24 17:31:02.0 +0200 geos/source/index/bintree/Node.cpp 2011-05-24 17:54:22.0 +0200 @@ -15,6 +15,7 @@ **/ @@ -51,8 +51,8 @@ Index: geos/source/index/bintree/Node.cpp return subnode[index]; Index: geos/source/geomgraph/Node.cpp === geos.orig/source/geomgraph/Node.cpp2011-05-24 17:29:37.0 +0200 -+++ geos/source/geomgraph/Node.cpp 2011-05-24 17:30:35.0 +0200 +--- geos.orig/source/geomgraph/Node.cpp2011-05-24 17:31:02.0 +0200 geos/source/geomgraph/Node.cpp 2011-05-24 17:54:22.0 +0200 @@ -30,6 +30,7 @@ #include sstream #include vector @@ -81,8 +81,8 @@ Index: geos/source/geomgraph/Node.cpp int newLoc; Index: geos/source/index/quadtree/Node.cpp === geos.orig/source/index/quadtree/Node.cpp 2011-05-24 17:28:56.0 +0200 -+++ geos/source/index/quadtree/Node.cpp2011-05-24 17:29:13.0 +0200 +--- geos.orig/source/index/quadtree/Node.cpp 2011-05-24 17:31:02.0 +0200 geos/source/index/quadtree/Node.cpp2011-05-24 17:54:22.0 +0200 @@ -25,6 +25,7 @@ #include string #include sstream @@ -109,3 +109,33 @@ Index: geos/source/index/quadtree/Node.cpp { subnode[index] = createSubnode(index).release(); } +Index: geos/source/index/bintree/Bintree.cpp +=== +--- geos.orig/source/index/bintree/Bintree.cpp 2011-05-24 17:54:40.0 +0200 geos/source/index/bintree/Bintree.cpp 2011-05-24 17:55:56.0 +0200 +@@ -67,14 +67,14 @@ + int + Bintree::depth() + { +- if (root!=NULL) return root-depth(); ++ if (root!=std::NULL) return root-depth(); + return 0; + } + + int + Bintree::size() + { +- if (root!=NULL) return root-size(); ++ if (root!=std::NULL) return root-size(); + return 0; + } + +@@ -86,7 +86,7 @@ + int + Bintree::nodeSize() + { +- if (root!=NULL) return root-nodeSize(); ++ if (root!=std::NULL) return root-nodeSize(); + return 0; + } + -- 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
[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8
The following commit has been merged in the master branch: commit 48d0aee749df35c60df0d355d6022512ce5344e0 Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue May 24 18:11:44 2011 +0200 Still a fix for qualifier. diff --git a/debian/patches/Bintree.cpp b/debian/patches/Bintree.cpp index dd93150..2dc9748 100644 --- a/debian/patches/Bintree.cpp +++ b/debian/patches/Bintree.cpp @@ -1,7 +1,7 @@ Index: geos/source/index/bintree/Bintree.cpp === geos.orig/source/index/bintree/Bintree.cpp 2011-05-24 17:06:29.0 +0200 -+++ geos/source/index/bintree/Bintree.cpp 2011-05-24 17:07:06.0 +0200 +--- geos.orig/source/index/bintree/Bintree.cpp 2011-05-24 18:10:41.0 +0200 geos/source/index/bintree/Bintree.cpp 2011-05-24 18:11:29.0 +0200 @@ -18,6 +18,7 @@ #include geos/index/bintree/Root.h #include geos/index/bintree/Interval.h @@ -10,3 +10,29 @@ Index: geos/source/index/bintree/Bintree.cpp namespace geos { namespace index { // geos.index +@@ -66,14 +67,14 @@ + int + Bintree::depth() + { +- if (root!=NULL) return root-depth(); ++ if (root!=std::NULL) return root-depth(); + return 0; + } + + int + Bintree::size() + { +- if (root!=NULL) return root-size(); ++ if (root!=std::NULL) return root-size(); + return 0; + } + +@@ -85,7 +86,7 @@ + int + Bintree::nodeSize() + { +- if (root!=NULL) return root-nodeSize(); ++ if (root!=std::NULL) return root-nodeSize(); + return 0; + } + -- 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
[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8
The following commit has been merged in the master branch: commit 474de6c070023129ad5e543649c2d07193e913a8 Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue May 24 18:16:40 2011 +0200 Changed a bit patch order diff --git a/debian/patches/Node.cpp b/debian/patches/Node.cpp index 1f7876c..e858991 100644 --- a/debian/patches/Node.cpp +++ b/debian/patches/Node.cpp @@ -109,33 +109,3 @@ Index: geos/source/index/quadtree/Node.cpp { subnode[index] = createSubnode(index).release(); } -Index: geos/source/index/bintree/Bintree.cpp -=== geos.orig/source/index/bintree/Bintree.cpp 2011-05-24 17:54:40.0 +0200 -+++ geos/source/index/bintree/Bintree.cpp 2011-05-24 17:55:56.0 +0200 -@@ -67,14 +67,14 @@ - int - Bintree::depth() - { -- if (root!=NULL) return root-depth(); -+ if (root!=std::NULL) return root-depth(); - return 0; - } - - int - Bintree::size() - { -- if (root!=NULL) return root-size(); -+ if (root!=std::NULL) return root-size(); - return 0; - } - -@@ -86,7 +86,7 @@ - int - Bintree::nodeSize() - { -- if (root!=NULL) return root-nodeSize(); -+ if (root!=std::NULL) return root-nodeSize(); - return 0; - } - -- 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
[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8
The following commit has been merged in the master branch: commit 4af268b2f7d2822a7084a3608758a20458d5dd4a Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed May 25 12:35:50 2011 +0200 Changed a bit Node.cpp patch. diff --git a/debian/patches/Node.cpp b/debian/patches/Node.cpp index e858991..bec4a7d 100644 --- a/debian/patches/Node.cpp +++ b/debian/patches/Node.cpp @@ -1,7 +1,7 @@ Index: geos/source/index/bintree/Node.cpp === geos.orig/source/index/bintree/Node.cpp2011-05-24 17:31:02.0 +0200 -+++ geos/source/index/bintree/Node.cpp 2011-05-24 17:54:22.0 +0200 +--- geos.orig/source/index/bintree/Node.cpp2011-05-24 18:16:35.0 +0200 geos/source/index/bintree/Node.cpp 2011-05-25 12:17:04.0 +0200 @@ -15,6 +15,7 @@ **/ @@ -51,8 +51,8 @@ Index: geos/source/index/bintree/Node.cpp return subnode[index]; Index: geos/source/geomgraph/Node.cpp === geos.orig/source/geomgraph/Node.cpp2011-05-24 17:31:02.0 +0200 -+++ geos/source/geomgraph/Node.cpp 2011-05-24 17:54:22.0 +0200 +--- geos.orig/source/geomgraph/Node.cpp2011-05-24 18:16:35.0 +0200 geos/source/geomgraph/Node.cpp 2011-05-25 12:17:04.0 +0200 @@ -30,6 +30,7 @@ #include sstream #include vector @@ -81,8 +81,8 @@ Index: geos/source/geomgraph/Node.cpp int newLoc; Index: geos/source/index/quadtree/Node.cpp === geos.orig/source/index/quadtree/Node.cpp 2011-05-24 17:31:02.0 +0200 -+++ geos/source/index/quadtree/Node.cpp2011-05-24 17:54:22.0 +0200 +--- geos.orig/source/index/quadtree/Node.cpp 2011-05-24 18:16:35.0 +0200 geos/source/index/quadtree/Node.cpp2011-05-25 12:17:04.0 +0200 @@ -25,6 +25,7 @@ #include string #include sstream @@ -109,3 +109,33 @@ Index: geos/source/index/quadtree/Node.cpp { subnode[index] = createSubnode(index).release(); } +Index: geos/source/index/bintree/Bintree.cpp +=== +--- geos.orig/source/index/bintree/Bintree.cpp 2011-05-25 12:34:58.0 +0200 geos/source/index/bintree/Bintree.cpp 2011-05-25 12:35:09.0 +0200 +@@ -67,14 +67,14 @@ + int + Bintree::depth() + { +- if (root!=std::NULL) return root-depth(); ++ if (root!=NULL) return root-depth(); + return 0; + } + + int + Bintree::size() + { +- if (root!=std::NULL) return root-size(); ++ if (root!=NULL) return root-size(); + return 0; + } + +@@ -86,7 +86,7 @@ + int + Bintree::nodeSize() + { +- if (root!=std::NULL) return root-nodeSize(); ++ if (root!=NULL) return root-nodeSize(); + return 0; + } + -- 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
[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8
The following commit has been merged in the master branch: commit 804ceb67d6a5cf9b9fbc9a4ac813d5fdffe0 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed May 25 12:47:01 2011 +0200 Changing qualification in Node.cpp diff --git a/debian/patches/Node.cpp b/debian/patches/Node.cpp index bec4a7d..506bb11 100644 --- a/debian/patches/Node.cpp +++ b/debian/patches/Node.cpp @@ -1,7 +1,7 @@ Index: geos/source/index/bintree/Node.cpp === geos.orig/source/index/bintree/Node.cpp2011-05-24 18:16:35.0 +0200 -+++ geos/source/index/bintree/Node.cpp 2011-05-25 12:17:04.0 +0200 +--- geos.orig/source/index/bintree/Node.cpp2011-05-25 12:45:36.0 +0200 geos/source/index/bintree/Node.cpp 2011-05-25 12:46:20.0 +0200 @@ -15,6 +15,7 @@ **/ @@ -10,49 +10,19 @@ Index: geos/source/index/bintree/Node.cpp #include geos/index/bintree/Node.h #include geos/index/bintree/Key.h -@@ -38,9 +39,9 @@ - Node::createExpanded(Node *node,Interval *addInterval) - { - Interval *expandInt=new Interval(addInterval); -- if (node!=NULL) expandInt-expandToInclude(node-interval); -+ if (node!=std::NULL) expandInt-expandToInclude(node-interval); - Node *largerNode=createNode(expandInt); -- if (node!=NULL) largerNode-insert(node); -+ if (node!=std::NULL) largerNode-insert(node); - delete expandInt; - return largerNode; - } -@@ -99,7 +100,7 @@ - int subnodeIndex=getSubnodeIndex(searchInterval,centre); - if (subnodeIndex==-1) - return this; -- if (subnode[subnodeIndex]!=NULL) { -+ if (subnode[subnodeIndex]!=std::NULL) { - // query lies in subnode, so search it - Node *node=subnode[subnodeIndex]; - return node-find(searchInterval); -@@ -111,7 +112,7 @@ - void - Node::insert(Node *node) - { -- assert(interval==NULL || interval-contains(node-interval)); -+ assert(interval==std::NULL || interval-contains(node-interval)); - int index=getSubnodeIndex(node-interval,centre); - if (node-level==level-1) { - subnode[index]=node; -@@ -131,7 +132,7 @@ +@@ -24,6 +25,8 @@ + namespace index { // geos.index + namespace bintree { // geos.index.bintree + ++using namespace std; ++ Node* - Node::getSubnode(int index) + Node::createNode(Interval *itemInterval) { -- if (subnode[index]==NULL) { -+ if (subnode[index]==std::NULL) { - subnode[index]=createSubnode(index); - } - return subnode[index]; Index: geos/source/geomgraph/Node.cpp === geos.orig/source/geomgraph/Node.cpp2011-05-24 18:16:35.0 +0200 -+++ geos/source/geomgraph/Node.cpp 2011-05-25 12:17:04.0 +0200 +--- geos.orig/source/geomgraph/Node.cpp2011-05-25 12:45:36.0 +0200 geos/source/geomgraph/Node.cpp 2011-05-25 12:45:40.0 +0200 @@ -30,6 +30,7 @@ #include sstream #include vector @@ -81,8 +51,8 @@ Index: geos/source/geomgraph/Node.cpp int newLoc; Index: geos/source/index/quadtree/Node.cpp === geos.orig/source/index/quadtree/Node.cpp 2011-05-24 18:16:35.0 +0200 -+++ geos/source/index/quadtree/Node.cpp2011-05-25 12:17:04.0 +0200 +--- geos.orig/source/index/quadtree/Node.cpp 2011-05-25 12:45:36.0 +0200 geos/source/index/quadtree/Node.cpp2011-05-25 12:45:40.0 +0200 @@ -25,6 +25,7 @@ #include string #include sstream @@ -111,8 +81,8 @@ Index: geos/source/index/quadtree/Node.cpp } Index: geos/source/index/bintree/Bintree.cpp === geos.orig/source/index/bintree/Bintree.cpp 2011-05-25 12:34:58.0 +0200 -+++ geos/source/index/bintree/Bintree.cpp 2011-05-25 12:35:09.0 +0200 +--- geos.orig/source/index/bintree/Bintree.cpp 2011-05-25 12:45:40.0 +0200 geos/source/index/bintree/Bintree.cpp 2011-05-25 12:45:40.0 +0200 @@ -67,14 +67,14 @@ int Bintree::depth() -- 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
[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8
The following commit has been merged in the master branch: commit d5bd9aa0d7ec5f1c4935e5f28666ce431fab2775 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed May 25 13:04:07 2011 +0200 Revised patchset. diff --git a/debian/patches/Bintree.cpp b/debian/patches/Bintree.cpp index 2dc9748..801eb4d 100644 --- a/debian/patches/Bintree.cpp +++ b/debian/patches/Bintree.cpp @@ -1,7 +1,7 @@ Index: geos/source/index/bintree/Bintree.cpp === geos.orig/source/index/bintree/Bintree.cpp 2011-05-24 18:10:41.0 +0200 -+++ geos/source/index/bintree/Bintree.cpp 2011-05-24 18:11:29.0 +0200 +--- geos.orig/source/index/bintree/Bintree.cpp 2011-05-25 12:56:17.0 +0200 geos/source/index/bintree/Bintree.cpp 2011-05-25 12:58:36.0 +0200 @@ -18,6 +18,7 @@ #include geos/index/bintree/Root.h #include geos/index/bintree/Interval.h @@ -10,29 +10,3 @@ Index: geos/source/index/bintree/Bintree.cpp namespace geos { namespace index { // geos.index -@@ -66,14 +67,14 @@ - int - Bintree::depth() - { -- if (root!=NULL) return root-depth(); -+ if (root!=std::NULL) return root-depth(); - return 0; - } - - int - Bintree::size() - { -- if (root!=NULL) return root-size(); -+ if (root!=std::NULL) return root-size(); - return 0; - } - -@@ -85,7 +86,7 @@ - int - Bintree::nodeSize() - { -- if (root!=NULL) return root-nodeSize(); -+ if (root!=std::NULL) return root-nodeSize(); - return 0; - } - diff --git a/debian/patches/Node.cpp b/debian/patches/Node.cpp index 506bb11..5d1b30c 100644 --- a/debian/patches/Node.cpp +++ b/debian/patches/Node.cpp @@ -1,7 +1,7 @@ Index: geos/source/index/bintree/Node.cpp === geos.orig/source/index/bintree/Node.cpp2011-05-25 12:45:36.0 +0200 -+++ geos/source/index/bintree/Node.cpp 2011-05-25 12:46:20.0 +0200 +--- geos.orig/source/index/bintree/Node.cpp2011-05-25 12:56:17.0 +0200 geos/source/index/bintree/Node.cpp 2011-05-25 12:58:49.0 +0200 @@ -15,6 +15,7 @@ **/ @@ -21,8 +21,8 @@ Index: geos/source/index/bintree/Node.cpp { Index: geos/source/geomgraph/Node.cpp === geos.orig/source/geomgraph/Node.cpp2011-05-25 12:45:36.0 +0200 -+++ geos/source/geomgraph/Node.cpp 2011-05-25 12:45:40.0 +0200 +--- geos.orig/source/geomgraph/Node.cpp2011-05-25 12:56:17.0 +0200 geos/source/geomgraph/Node.cpp 2011-05-25 13:00:59.0 +0200 @@ -30,6 +30,7 @@ #include sstream #include vector @@ -31,28 +31,25 @@ Index: geos/source/geomgraph/Node.cpp #ifndef GEOS_DEBUG #define GEOS_DEBUG 0 -@@ -178,7 +179,7 @@ - void - Node::setLabel(int argIndex, int onLocation) - { -- if (label==NULL) { -+ if (label==std::NULL) { - label=new Label(argIndex, onLocation); - } else - label-setLocation(argIndex, onLocation); -@@ -191,7 +192,7 @@ - Node::setLabelBoundary(int argIndex) - { - int loc=Location::UNDEF; -- if (label!=NULL) -+ if (label!=std::NULL) - loc=label-getLocation(argIndex); - // flip the loc - int newLoc; +@@ -38,12 +39,13 @@ + #define COMPUTE_Z 1 + #endif + +-using namespace std; + using namespace geos::geom; + + namespace geos { + namespace geomgraph { // geos.geomgraph + ++using namespace std; ++ + /*public*/ + Node::Node(const Coordinate newCoord, EdgeEndStar* newEdges) + : Index: geos/source/index/quadtree/Node.cpp === geos.orig/source/index/quadtree/Node.cpp 2011-05-25 12:45:36.0 +0200 -+++ geos/source/index/quadtree/Node.cpp2011-05-25 12:45:40.0 +0200 +--- geos.orig/source/index/quadtree/Node.cpp 2011-05-25 12:56:17.0 +0200 geos/source/index/quadtree/Node.cpp2011-05-25 13:02:00.0 +0200 @@ -25,6 +25,7 @@ #include string #include sstream @@ -61,51 +58,12 @@ Index: geos/source/index/quadtree/Node.cpp #ifndef GEOS_DEBUG #define GEOS_DEBUG 0 -@@ -103,7 +104,7 @@ - int subnodeIndex=getSubnodeIndex(searchEnv, centre); - if (subnodeIndex==-1) - return this; -- if (subnode[subnodeIndex]!=NULL) { -+ if (subnode[subnodeIndex]!=std::NULL) { - // query lies in subquad, so search it - Node *node=subnode[subnodeIndex]; - return node-find(searchEnv); -@@ -146,7 +147,7 @@ - Node::getSubnode(int index) - { - assert(index =0 index 4); -- if (subnode[index] == NULL) -+ if (subnode[index] == std::NULL) - { - subnode[index] = createSubnode(index).release(); - } -Index:
[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8
The following commit has been merged in the master branch: commit 0bf2e677899e9725e5f614e20021f16cd84abfa1 Author: Francesco Paolo Lovergine fran...@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 fran...@debian.org Tue, 24 May 2011 17:31:19 +0200 + -- Francesco Paolo Lovergine fran...@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 000..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.0 +0200 geos/source/headers/geos/index/chain/MonotoneChainBuilder.h 2011-05-25 13:12:35.0 +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 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8
The following commit has been merged in the master branch: commit 34826d7c7415b4ae52dd0cb209dcff64c9e70711 Author: Francesco Paolo Lovergine fran...@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 fran...@debian.org Wed, 25 May 2011 13:13:03 +0200 + -- Francesco Paolo Lovergine fran...@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 000..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.cpp2011-05-25 13:22:35.0 +0200 geos/source/index/strtree/AbstractNode.cpp 2011-05-25 13:22:52.0 +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 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8
The following commit has been merged in the master branch: commit 786f97f2021b181ff36310fcd8a6d00c7af7e85f Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed May 25 14:22:38 2011 +0200 Added -fpermessive diff --git a/debian/changelog b/debian/changelog index 5b6cd53..86c075f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,10 @@ geos (3.2.2-2) unstable; urgency=low (closes: #624949) * Added Bintree.cpp, Node.cpp, MonotoneChainBuilder.h, AbstractNode.cpp patches to fix a missing header file inclusion in some files. + * Use -fpermessive at building time to work around some minor compatibility +problems which prevent a successuful building. - -- Francesco Paolo Lovergine fran...@debian.org Wed, 25 May 2011 13:23:46 +0200 + -- Francesco Paolo Lovergine fran...@debian.org Wed, 25 May 2011 14:21:49 +0200 geos (3.2.2-1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index c68aca0..4ea057f 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,7 @@ else $(info Guessed geos version is $(VER)) endif -CFLAGS = -Wall -g +CFLAGS = -Wall -g -fpermessive ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 -- 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
[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8
The following commit has been merged in the master branch: commit 2e16daafe23bf02110d5f8fb32c4cd66a66aed28 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed May 25 14:25:37 2011 +0200 Typo fixed in debian/rules diff --git a/debian/rules b/debian/rules index 4ea057f..fa25675 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,7 @@ else $(info Guessed geos version is $(VER)) endif -CFLAGS = -Wall -g -fpermessive +CFLAGS = -Wall -g -fpermissive ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 -- 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
[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8
The following commit has been merged in the master branch: commit b15b2e44645edac018cf7de08fea5e69a3ab5fa9 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed May 25 14:45:27 2011 +0200 Forcing CFLAGS at building time. diff --git a/debian/rules b/debian/rules index fa25675..0e93c13 100755 --- a/debian/rules +++ b/debian/rules @@ -69,7 +69,7 @@ build: build-arch build-indep build-arch: build-arch-stamp build-arch-stamp: config.status # Add here commands to compile the arch part of the package. - $(MAKE) + CFLAGS=$(CFLAGS) $(MAKE) touch $@ build-indep: build-indep-stamp -- 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
[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8
The following commit has been merged in the master branch: commit 4495372d93e1cd2d56a5db5bbad0ec66f65d02e7 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed May 25 15:11:52 2011 +0200 Still another cstddef include missing. diff --git a/debian/patches/SimpleNestedRingTester.h b/debian/patches/SimpleNestedRingTester.h new file mode 100644 index 000..77b49d4 --- /dev/null +++ b/debian/patches/SimpleNestedRingTester.h @@ -0,0 +1,21 @@ +Index: geos/source/headers/geos/operation/valid/SimpleNestedRingTester.h +=== +--- geos.orig/source/headers/geos/operation/valid/SimpleNestedRingTester.h 2011-05-25 15:10:53.0 +0200 geos/source/headers/geos/operation/valid/SimpleNestedRingTester.h 2011-05-25 15:11:11.0 +0200 +@@ -24,6 +24,7 @@ + #include geos/export.h + + #include vector ++#include cstddef + + // Forward declarations + namespace geos { +@@ -40,6 +41,8 @@ + namespace operation { // geos::operation + namespace valid { // geos::operation::valid + ++using namespace std; ++ + /** \brief + * Tests whether any of a set of {@link LinearRing}s are + * nested inside another ring in the set, using a simple O(n^2) diff --git a/debian/patches/series b/debian/patches/series index 2aba345..a4edf69 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ Node.cpp Root.cpp MonotoneChainBuilder.h AbstractNode.cpp +SimpleNestedRingTester.h -- 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
[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8
The following commit has been merged in the master branch: commit 2511bc7a2bfce86715d99fcdd8fe279f07443fc8 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed May 25 16:12:28 2011 +0200 Added DouglasPeuckerLineSimplifier.h patch. diff --git a/debian/patches/DouglasPeuckerLineSimplifier.h b/debian/patches/DouglasPeuckerLineSimplifier.h new file mode 100644 index 000..3396826 --- /dev/null +++ b/debian/patches/DouglasPeuckerLineSimplifier.h @@ -0,0 +1,21 @@ +Index: geos/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h +=== +--- geos.orig/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h 2011-05-25 16:11:31.0 +0200 geos/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h 2011-05-25 16:12:10.0 +0200 +@@ -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 @@ + namespace geos { + namespace simplify { // geos::simplify + ++using namespace std; ++ + /** \brief + * Simplifies a linestring (sequence of points) using + * the standard Douglas-Peucker algorithm. diff --git a/debian/patches/series b/debian/patches/series index f55ed3c..692ceff 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ MonotoneChainBuilder.h AbstractNode.cpp SimpleNestedRingTester.h DirectedEdgeStar.h +DouglasPeuckerLineSimplifier.h -- 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
[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8
The following commit has been merged in the master branch: commit aa7b80f0f88e118c526432d9a07c4c00dc52bf8c Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed May 25 17:05:20 2011 +0200 Added TaggedLineString.cpp patch diff --git a/debian/patches/TaggedLineString.cpp b/debian/patches/TaggedLineString.cpp new file mode 100644 index 000..8749ddb --- /dev/null +++ b/debian/patches/TaggedLineString.cpp @@ -0,0 +1,21 @@ +Index: geos/source/simplify/TaggedLineString.cpp +=== +--- geos.orig/source/simplify/TaggedLineString.cpp 2011-05-25 17:04:12.0 +0200 geos/source/simplify/TaggedLineString.cpp 2011-05-25 17:04:31.0 +0200 +@@ -27,6 +27,7 @@ + + #include cassert + #include memory ++#include cstddef + + #ifndef GEOS_DEBUG + #define GEOS_DEBUG 0 +@@ -42,6 +43,8 @@ + namespace geos { + namespace simplify { // geos::simplify + ++using namespace std; ++ + /*public*/ + TaggedLineString::TaggedLineString(const geom::LineString* nParentLine, + size_t nMinimumSize) diff --git a/debian/patches/series b/debian/patches/series index 692ceff..b142917 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ AbstractNode.cpp SimpleNestedRingTester.h DirectedEdgeStar.h DouglasPeuckerLineSimplifier.h +TaggedLineString.cpp -- 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
[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8
The following commit has been merged in the master branch: commit 67f5cf6787e0a67cdee92ac3fb33616de8e9e267 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed May 25 17:49:51 2011 +0200 Added TaggedLineString.h patch diff --git a/debian/patches/TaggedLineString.h b/debian/patches/TaggedLineString.h new file mode 100644 index 000..a84458e --- /dev/null +++ b/debian/patches/TaggedLineString.h @@ -0,0 +1,20 @@ +Index: geos/source/headers/geos/simplify/TaggedLineString.h +=== +--- geos.orig/source/headers/geos/simplify/TaggedLineString.h 2011-05-25 17:49:06.0 +0200 geos/source/headers/geos/simplify/TaggedLineString.h 2011-05-25 17:49:28.0 +0200 +@@ -29,6 +29,7 @@ + #include geos/export.h + #include vector + #include memory ++#include cstddef + + // Forward declarations + namespace geos { +@@ -47,6 +48,7 @@ + namespace geos { + namespace simplify { // geos::simplify + ++using namespace std; + + /** \brief + * diff --git a/debian/patches/series b/debian/patches/series index b142917..3860547 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ SimpleNestedRingTester.h DirectedEdgeStar.h DouglasPeuckerLineSimplifier.h TaggedLineString.cpp +TaggedLineString.h -- 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
[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8
The following commit has been merged in the master branch: commit 04972d8aedaf23df082f31d152f1ea4778dbdde6 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed May 25 18:04:20 2011 +0200 Patch for TaggedLineStringSimplifier.h diff --git a/debian/patches/TaggedLineStringSimplifier.h b/debian/patches/TaggedLineStringSimplifier.h new file mode 100644 index 000..61cbb03 --- /dev/null +++ b/debian/patches/TaggedLineStringSimplifier.h @@ -0,0 +1,20 @@ +Index: geos/source/headers/geos/simplify/TaggedLineStringSimplifier.h +=== +--- geos.orig/source/headers/geos/simplify/TaggedLineStringSimplifier.h 2011-05-25 17:59:12.0 +0200 geos/source/headers/geos/simplify/TaggedLineStringSimplifier.h 2011-05-25 17:59:30.0 +0200 +@@ -28,6 +28,7 @@ + #include geos/export.h + #include vector + #include memory ++#include cstddef + + // Forward declarations + namespace geos { +@@ -48,6 +49,7 @@ + namespace geos { + namespace simplify { // geos::simplify + ++using namespace std; + + /** \brief + * Simplifies a TaggedLineString, preserving topology diff --git a/debian/patches/series b/debian/patches/series index 3860547..c778044 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,4 @@ DirectedEdgeStar.h DouglasPeuckerLineSimplifier.h TaggedLineString.cpp TaggedLineString.h +TaggedLineStringSimplifier.h -- 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