[geos] 14/16: Drop disabled patches.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Mon Aug 17 14:37:06 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository geos.
commit 5aab491314224892cc0b2c845a275aa5d6c6a442
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Aug 17 16:27:13 2015 +0200
Drop disabled patches.
---
debian/patches/CoordinateSequenceFactory.h | 14 ------
debian/patches/DirectedEdgeStar.h | 23 ---------
debian/patches/DouglasPeuckerLineSimplifier.h | 23 ---------
debian/patches/Node.cpp | 67 ---------------------------
debian/patches/Root.cpp | 40 ----------------
debian/patches/SimpleNestedRingTester.h | 23 ---------
debian/patches/TaggedLineString.cpp | 23 ---------
debian/patches/TaggedLineString.h | 22 ---------
debian/patches/TaggedLineStringSimplifier.h | 22 ---------
debian/patches/series | 9 ----
10 files changed, 266 deletions(-)
diff --git a/debian/patches/CoordinateSequenceFactory.h b/debian/patches/CoordinateSequenceFactory.h
deleted file mode 100644
index bdf6ae8..0000000
--- a/debian/patches/CoordinateSequenceFactory.h
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix FTBFS due to a missing declaration.
-Author: Francesco Paolo Lovergine <frankie at debian.org>
-Bug-Debian: https://bugs.debian.org/624949
---- a/include/geos/geom/CoordinateSequenceFactory.h
-+++ b/include/geos/geom/CoordinateSequenceFactory.h
-@@ -23,7 +23,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/DirectedEdgeStar.h b/debian/patches/DirectedEdgeStar.h
deleted file mode 100644
index f43e372..0000000
--- a/debian/patches/DirectedEdgeStar.h
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Include cstddef and use std namespace.
- Fix a missing cstddef header file inclusion in some files and use
- of std namespace. This is required in current default gcc flavor.
-Author: Francesco Paolo Lovergine <frankie at debian.org>
---- a/include/geos/planargraph/DirectedEdgeStar.h
-+++ b/include/geos/planargraph/DirectedEdgeStar.h
-@@ -19,6 +19,7 @@
- #include <geos/export.h>
-
- #include <vector>
-+#include <cstddef>
-
- #ifdef _MSC_VER
- #pragma warning(push)
-@@ -39,6 +40,8 @@ namespace geos {
- namespace geos {
- namespace planargraph { // geos.planargraph
-
-+using namespace std;
-+
- /// A sorted collection of DirectedEdge which leave a Node in a PlanarGraph.
- class GEOS_DLL DirectedEdgeStar {
- protected:
diff --git a/debian/patches/DouglasPeuckerLineSimplifier.h b/debian/patches/DouglasPeuckerLineSimplifier.h
deleted file mode 100644
index 064f035..0000000
--- a/debian/patches/DouglasPeuckerLineSimplifier.h
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Include cstddef and use std namespace.
- Fix a missing cstddef header file inclusion in some files and use
- of std namespace. This is required in current default gcc flavor.
-Author: Francesco Paolo Lovergine <frankie at debian.org>
---- a/include/geos/simplify/DouglasPeuckerLineSimplifier.h
-+++ b/include/geos/simplify/DouglasPeuckerLineSimplifier.h
-@@ -22,6 +22,7 @@
- #include <geos/export.h>
- #include <vector>
- #include <memory> // for auto_ptr
-+#include <cstddef>
-
- #ifdef _MSC_VER
- #pragma warning(push)
-@@ -38,6 +39,8 @@ namespace geos {
- 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/Node.cpp b/debian/patches/Node.cpp
deleted file mode 100644
index ba45600..0000000
--- a/debian/patches/Node.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-Description: Include cstddef and use std namespace.
- Fix a missing cstddef header file inclusion in some files and use
- of std namespace. This is required in current default gcc flavor.
-Author: Francesco Paolo Lovergine <frankie at debian.org>
---- a/src/index/bintree/Node.cpp
-+++ b/src/index/bintree/Node.cpp
-@@ -15,6 +15,7 @@
-
- #include <cstddef>
- #include <cassert>
-+#include <cstddef>
-
- #include <geos/index/bintree/Node.h>
- #include <geos/index/bintree/Key.h>
-@@ -24,6 +25,8 @@ namespace geos {
- namespace index { // geos.index
- namespace bintree { // geos.index.bintree
-
-+using namespace std;
-+
- Node*
- Node::createNode(Interval *itemInterval)
- {
---- a/src/geomgraph/Node.cpp
-+++ b/src/geomgraph/Node.cpp
-@@ -33,6 +33,7 @@
- #include <sstream>
- #include <vector>
- #include <algorithm>
-+#include <cstddef>
-
- #ifndef GEOS_DEBUG
- #define GEOS_DEBUG 0
-@@ -41,12 +42,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)
- :
---- a/src/index/quadtree/Node.cpp
-+++ b/src/index/quadtree/Node.cpp
-@@ -24,6 +24,7 @@
- #include <string>
- #include <sstream>
- #include <cassert>
-+#include <cstddef>
-
- #ifndef GEOS_DEBUG
- #define GEOS_DEBUG 0
-@@ -40,6 +41,8 @@ namespace geos {
- namespace index { // geos.index
- namespace quadtree { // geos.index.quadtree
-
-+using namespace std;
-+
- /* public static */
- std::auto_ptr<Node>
- Node::createNode(const Envelope& env)
diff --git a/debian/patches/Root.cpp b/debian/patches/Root.cpp
deleted file mode 100644
index 4ccfbee..0000000
--- a/debian/patches/Root.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Include cstddef and use std namespace.
- Fix a missing cstddef header file inclusion in some files and use
- of std namespace. This is required in current default gcc flavor.
-Author: Francesco Paolo Lovergine <frankie at debian.org>
---- a/src/index/bintree/Root.cpp
-+++ b/src/index/bintree/Root.cpp
-@@ -20,11 +20,14 @@
-
- #include <cstddef>
- #include <cassert>
-+#include <cstddef>
-
- namespace geos {
- namespace index { // geos.index
- namespace bintree { // geos.index.bintree
-
-+using namespace std;
-+
- double Root::origin=0.0;
-
- void
---- a/src/index/quadtree/Root.cpp
-+++ b/src/index/quadtree/Root.cpp
-@@ -24,6 +24,7 @@
- #include <geos/geom/Envelope.h>
-
- #include <cassert>
-+#include <cstddef>
-
- #ifndef GEOS_DEBUG
- #define GEOS_DEBUG 0
-@@ -39,6 +40,8 @@ namespace geos {
- namespace index { // geos.index
- namespace quadtree { // geos.index.quadtree
-
-+using namespace std;
-+
- // the singleton root quad is centred at the origin.
- //Coordinate* Root::origin=new Coordinate(0.0, 0.0);
- const Coordinate Root::origin(0.0, 0.0);
diff --git a/debian/patches/SimpleNestedRingTester.h b/debian/patches/SimpleNestedRingTester.h
deleted file mode 100644
index fa0f3e1..0000000
--- a/debian/patches/SimpleNestedRingTester.h
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Include cstddef and use std namespace.
- Fix a missing cstddef header file inclusion in some files and use
- of std namespace. This is required in current default gcc flavor.
-Author: Francesco Paolo Lovergine <frankie at debian.org>
---- a/include/geos/operation/valid/SimpleNestedRingTester.h
-+++ b/include/geos/operation/valid/SimpleNestedRingTester.h
-@@ -24,6 +24,7 @@
-
- #include <cstddef>
- #include <vector>
-+#include <cstddef>
-
- #ifdef _MSC_VER
- #pragma warning(push)
-@@ -45,6 +46,8 @@ namespace geos {
- 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/TaggedLineString.cpp b/debian/patches/TaggedLineString.cpp
deleted file mode 100644
index 7849b24..0000000
--- a/debian/patches/TaggedLineString.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Include cstddef and use std namespace.
- Fix a missing cstddef header file inclusion in some files and use
- of std namespace. This is required in current default gcc flavor.
-Author: Francesco Paolo Lovergine <frankie at debian.org>
---- a/src/simplify/TaggedLineString.cpp
-+++ b/src/simplify/TaggedLineString.cpp
-@@ -26,6 +26,7 @@
-
- #include <cassert>
- #include <memory>
-+#include <cstddef>
-
- #ifndef GEOS_DEBUG
- #define GEOS_DEBUG 0
-@@ -41,6 +42,8 @@ using namespace std;
- namespace geos {
- namespace simplify { // geos::simplify
-
-+using namespace std;
-+
- /*public*/
- TaggedLineString::TaggedLineString(const geom::LineString* nParentLine,
- std::size_t nMinimumSize)
diff --git a/debian/patches/TaggedLineString.h b/debian/patches/TaggedLineString.h
deleted file mode 100644
index d8c33c2..0000000
--- a/debian/patches/TaggedLineString.h
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Include cstddef and use std namespace.
- Fix a missing cstddef header file inclusion in some files and use
- of std namespace. This is required in current default gcc flavor.
-Author: Francesco Paolo Lovergine <frankie at debian.org>
---- a/include/geos/simplify/TaggedLineString.h
-+++ b/include/geos/simplify/TaggedLineString.h
-@@ -28,6 +28,7 @@
- #include <geos/export.h>
- #include <vector>
- #include <memory>
-+#include <cstddef>
-
- #ifdef _MSC_VER
- #pragma warning(push)
-@@ -51,6 +52,7 @@ namespace geos {
- namespace geos {
- namespace simplify { // geos::simplify
-
-+using namespace std;
-
- /** \brief
- *
diff --git a/debian/patches/TaggedLineStringSimplifier.h b/debian/patches/TaggedLineStringSimplifier.h
deleted file mode 100644
index fbcd36a..0000000
--- a/debian/patches/TaggedLineStringSimplifier.h
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Include cstddef and use std namespace.
- Fix a missing cstddef header file inclusion in some files and use
- of std namespace. This is required in current default gcc flavor.
-Author: Francesco Paolo Lovergine <frankie at debian.org>
---- a/include/geos/simplify/TaggedLineStringSimplifier.h
-+++ b/include/geos/simplify/TaggedLineStringSimplifier.h
-@@ -28,6 +28,7 @@
- #include <cstddef>
- #include <vector>
- #include <memory>
-+#include <cstddef>
-
- #ifdef _MSC_VER
- #pragma warning(push)
-@@ -53,6 +54,7 @@ namespace geos {
- 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 b9a44c1..0bc9e2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,3 @@
-#CoordinateSequenceFactory.h
-#Node.cpp
-#Root.cpp
-#SimpleNestedRingTester.h
-#DirectedEdgeStar.h
-#DouglasPeuckerLineSimplifier.h
-#TaggedLineString.cpp
-#TaggedLineString.h
-#TaggedLineStringSimplifier.h
geos-config
libruby
ruby2
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/geos.git
More information about the Pkg-grass-devel
mailing list