[geos] 06/17: Refresh patches.
Bas Couwenberg
sebastic at xs4all.nl
Fri Mar 7 20:18:47 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository geos.
commit f3db86547b102b1f138c936a86d5ff9fcac26f22
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Feb 16 21:51:00 2014 +0100
Refresh patches.
---
debian/patches/CoordinateSequenceFactory.h | 6 ++----
debian/patches/DirectedEdgeStar.h | 8 +++-----
debian/patches/DouglasPeuckerLineSimplifier.h | 8 +++-----
debian/patches/Node.cpp | 22 ++++++++--------------
debian/patches/Root.cpp | 14 +++++---------
debian/patches/SimpleNestedRingTester.h | 8 +++-----
debian/patches/TaggedLineString.cpp | 8 +++-----
debian/patches/TaggedLineString.h | 8 +++-----
debian/patches/TaggedLineStringSimplifier.h | 8 +++-----
debian/patches/geos-config | 8 +++-----
debian/patches/libruby | 12 ++++--------
11 files changed, 40 insertions(+), 70 deletions(-)
diff --git a/debian/patches/CoordinateSequenceFactory.h b/debian/patches/CoordinateSequenceFactory.h
index 45b17f1..530752a 100644
--- a/debian/patches/CoordinateSequenceFactory.h
+++ b/debian/patches/CoordinateSequenceFactory.h
@@ -1,7 +1,5 @@
-Index: geos/include/geos/geom/CoordinateSequenceFactory.h
-===================================================================
---- geos.orig/include/geos/geom/CoordinateSequenceFactory.h 2013-12-06 13:43:33.267931420 +0100
-+++ geos/include/geos/geom/CoordinateSequenceFactory.h 2013-12-06 13:43:33.263931411 +0100
+--- a/include/geos/geom/CoordinateSequenceFactory.h
++++ b/include/geos/geom/CoordinateSequenceFactory.h
@@ -23,7 +23,7 @@
#include <geos/export.h>
#include <vector>
diff --git a/debian/patches/DirectedEdgeStar.h b/debian/patches/DirectedEdgeStar.h
index 604393b..b01e38c 100644
--- a/debian/patches/DirectedEdgeStar.h
+++ b/debian/patches/DirectedEdgeStar.h
@@ -1,7 +1,5 @@
-Index: geos/include/geos/planargraph/DirectedEdgeStar.h
-===================================================================
---- geos.orig/include/geos/planargraph/DirectedEdgeStar.h 2013-12-06 13:44:31.720065393 +0100
-+++ geos/include/geos/planargraph/DirectedEdgeStar.h 2013-12-06 13:44:31.716065384 +0100
+--- a/include/geos/planargraph/DirectedEdgeStar.h
++++ b/include/geos/planargraph/DirectedEdgeStar.h
@@ -19,6 +19,7 @@
#include <geos/export.h>
@@ -10,7 +8,7 @@ Index: geos/include/geos/planargraph/DirectedEdgeStar.h
#ifdef _MSC_VER
#pragma warning(push)
-@@ -39,6 +40,8 @@
+@@ -39,6 +40,8 @@ namespace geos {
namespace geos {
namespace planargraph { // geos.planargraph
diff --git a/debian/patches/DouglasPeuckerLineSimplifier.h b/debian/patches/DouglasPeuckerLineSimplifier.h
index 5403e6e..c6e205c 100644
--- a/debian/patches/DouglasPeuckerLineSimplifier.h
+++ b/debian/patches/DouglasPeuckerLineSimplifier.h
@@ -1,7 +1,5 @@
-Index: geos/include/geos/simplify/DouglasPeuckerLineSimplifier.h
-===================================================================
---- geos.orig/include/geos/simplify/DouglasPeuckerLineSimplifier.h 2013-12-06 13:44:45.868097879 +0100
-+++ geos/include/geos/simplify/DouglasPeuckerLineSimplifier.h 2013-12-06 13:44:45.864097871 +0100
+--- a/include/geos/simplify/DouglasPeuckerLineSimplifier.h
++++ b/include/geos/simplify/DouglasPeuckerLineSimplifier.h
@@ -22,6 +22,7 @@
#include <geos/export.h>
#include <vector>
@@ -10,7 +8,7 @@ Index: geos/include/geos/simplify/DouglasPeuckerLineSimplifier.h
#ifdef _MSC_VER
#pragma warning(push)
-@@ -38,6 +39,8 @@
+@@ -38,6 +39,8 @@ namespace geos {
namespace geos {
namespace simplify { // geos::simplify
diff --git a/debian/patches/Node.cpp b/debian/patches/Node.cpp
index 31c8b77..2850221 100644
--- a/debian/patches/Node.cpp
+++ b/debian/patches/Node.cpp
@@ -1,7 +1,5 @@
-Index: geos/src/index/bintree/Node.cpp
-===================================================================
---- geos.orig/src/index/bintree/Node.cpp 2013-12-06 13:43:50.727971397 +0100
-+++ geos/src/index/bintree/Node.cpp 2013-12-06 13:43:50.447970756 +0100
+--- a/src/index/bintree/Node.cpp
++++ b/src/index/bintree/Node.cpp
@@ -15,6 +15,7 @@
#include <cstddef>
@@ -10,7 +8,7 @@ Index: geos/src/index/bintree/Node.cpp
#include <geos/index/bintree/Node.h>
#include <geos/index/bintree/Key.h>
-@@ -24,6 +25,8 @@
+@@ -24,6 +25,8 @@ namespace geos {
namespace index { // geos.index
namespace bintree { // geos.index.bintree
@@ -19,10 +17,8 @@ Index: geos/src/index/bintree/Node.cpp
Node*
Node::createNode(Interval *itemInterval)
{
-Index: geos/src/geomgraph/Node.cpp
-===================================================================
---- geos.orig/src/geomgraph/Node.cpp 2013-12-06 13:43:50.727971397 +0100
-+++ geos/src/geomgraph/Node.cpp 2013-12-06 13:43:50.699971334 +0100
+--- a/src/geomgraph/Node.cpp
++++ b/src/geomgraph/Node.cpp
@@ -33,6 +33,7 @@
#include <sstream>
#include <vector>
@@ -46,10 +42,8 @@ Index: geos/src/geomgraph/Node.cpp
/*public*/
Node::Node(const Coordinate& newCoord, EdgeEndStar* newEdges)
:
-Index: geos/src/index/quadtree/Node.cpp
-===================================================================
---- geos.orig/src/index/quadtree/Node.cpp 2013-12-06 13:43:50.727971397 +0100
-+++ geos/src/index/quadtree/Node.cpp 2013-12-06 13:43:50.719971379 +0100
+--- a/src/index/quadtree/Node.cpp
++++ b/src/index/quadtree/Node.cpp
@@ -24,6 +24,7 @@
#include <string>
#include <sstream>
@@ -58,7 +52,7 @@ Index: geos/src/index/quadtree/Node.cpp
#ifndef GEOS_DEBUG
#define GEOS_DEBUG 0
-@@ -40,6 +41,8 @@
+@@ -40,6 +41,8 @@ namespace geos {
namespace index { // geos.index
namespace quadtree { // geos.index.quadtree
diff --git a/debian/patches/Root.cpp b/debian/patches/Root.cpp
index 4f37350..4fc4859 100644
--- a/debian/patches/Root.cpp
+++ b/debian/patches/Root.cpp
@@ -1,7 +1,5 @@
-Index: geos/src/index/bintree/Root.cpp
-===================================================================
---- geos.orig/src/index/bintree/Root.cpp 2013-12-06 13:44:06.528007604 +0100
-+++ geos/src/index/bintree/Root.cpp 2013-12-06 13:44:06.524007594 +0100
+--- a/src/index/bintree/Root.cpp
++++ b/src/index/bintree/Root.cpp
@@ -20,11 +20,14 @@
#include <cstddef>
@@ -17,10 +15,8 @@ Index: geos/src/index/bintree/Root.cpp
double Root::origin=0.0;
void
-Index: geos/src/index/quadtree/Root.cpp
-===================================================================
---- geos.orig/src/index/quadtree/Root.cpp 2013-12-06 13:44:06.528007604 +0100
-+++ geos/src/index/quadtree/Root.cpp 2013-12-06 13:44:06.524007594 +0100
+--- a/src/index/quadtree/Root.cpp
++++ b/src/index/quadtree/Root.cpp
@@ -24,6 +24,7 @@
#include <geos/geom/Envelope.h>
@@ -29,7 +25,7 @@ Index: geos/src/index/quadtree/Root.cpp
#ifndef GEOS_DEBUG
#define GEOS_DEBUG 0
-@@ -39,6 +40,8 @@
+@@ -39,6 +40,8 @@ namespace geos {
namespace index { // geos.index
namespace quadtree { // geos.index.quadtree
diff --git a/debian/patches/SimpleNestedRingTester.h b/debian/patches/SimpleNestedRingTester.h
index 38bb16e..2b30828 100644
--- a/debian/patches/SimpleNestedRingTester.h
+++ b/debian/patches/SimpleNestedRingTester.h
@@ -1,7 +1,5 @@
-Index: geos/include/geos/operation/valid/SimpleNestedRingTester.h
-===================================================================
---- geos.orig/include/geos/operation/valid/SimpleNestedRingTester.h 2013-12-06 13:44:15.344027819 +0100
-+++ geos/include/geos/operation/valid/SimpleNestedRingTester.h 2013-12-06 13:44:15.340027810 +0100
+--- a/include/geos/operation/valid/SimpleNestedRingTester.h
++++ b/include/geos/operation/valid/SimpleNestedRingTester.h
@@ -24,6 +24,7 @@
#include <cstddef>
@@ -10,7 +8,7 @@ Index: geos/include/geos/operation/valid/SimpleNestedRingTester.h
#ifdef _MSC_VER
#pragma warning(push)
-@@ -45,6 +46,8 @@
+@@ -45,6 +46,8 @@ namespace geos {
namespace operation { // geos::operation
namespace valid { // geos::operation::valid
diff --git a/debian/patches/TaggedLineString.cpp b/debian/patches/TaggedLineString.cpp
index 8ab1464..f9b2f01 100644
--- a/debian/patches/TaggedLineString.cpp
+++ b/debian/patches/TaggedLineString.cpp
@@ -1,7 +1,5 @@
-Index: geos/src/simplify/TaggedLineString.cpp
-===================================================================
---- geos.orig/src/simplify/TaggedLineString.cpp 2013-12-06 13:44:58.100125985 +0100
-+++ geos/src/simplify/TaggedLineString.cpp 2013-12-06 13:44:58.080125940 +0100
+--- a/src/simplify/TaggedLineString.cpp
++++ b/src/simplify/TaggedLineString.cpp
@@ -26,6 +26,7 @@
#include <cassert>
@@ -10,7 +8,7 @@ Index: geos/src/simplify/TaggedLineString.cpp
#ifndef GEOS_DEBUG
#define GEOS_DEBUG 0
-@@ -41,6 +42,8 @@
+@@ -41,6 +42,8 @@ using namespace std;
namespace geos {
namespace simplify { // geos::simplify
diff --git a/debian/patches/TaggedLineString.h b/debian/patches/TaggedLineString.h
index 8180d7a..cf19747 100644
--- a/debian/patches/TaggedLineString.h
+++ b/debian/patches/TaggedLineString.h
@@ -1,7 +1,5 @@
-Index: geos/include/geos/simplify/TaggedLineString.h
-===================================================================
---- geos.orig/include/geos/simplify/TaggedLineString.h 2013-12-06 13:45:24.508186722 +0100
-+++ geos/include/geos/simplify/TaggedLineString.h 2013-12-06 13:45:22.072181116 +0100
+--- a/include/geos/simplify/TaggedLineString.h
++++ b/include/geos/simplify/TaggedLineString.h
@@ -28,6 +28,7 @@
#include <geos/export.h>
#include <vector>
@@ -10,7 +8,7 @@ Index: geos/include/geos/simplify/TaggedLineString.h
#ifdef _MSC_VER
#pragma warning(push)
-@@ -51,6 +52,7 @@
+@@ -51,6 +52,7 @@ namespace geos {
namespace geos {
namespace simplify { // geos::simplify
diff --git a/debian/patches/TaggedLineStringSimplifier.h b/debian/patches/TaggedLineStringSimplifier.h
index e5d1235..cff31e8 100644
--- a/debian/patches/TaggedLineStringSimplifier.h
+++ b/debian/patches/TaggedLineStringSimplifier.h
@@ -1,7 +1,5 @@
-Index: geos/include/geos/simplify/TaggedLineStringSimplifier.h
-===================================================================
---- geos.orig/include/geos/simplify/TaggedLineStringSimplifier.h 2013-12-06 13:45:39.092220299 +0100
-+++ geos/include/geos/simplify/TaggedLineStringSimplifier.h 2013-12-06 13:45:39.084220281 +0100
+--- a/include/geos/simplify/TaggedLineStringSimplifier.h
++++ b/include/geos/simplify/TaggedLineStringSimplifier.h
@@ -28,6 +28,7 @@
#include <cstddef>
#include <vector>
@@ -10,7 +8,7 @@ Index: geos/include/geos/simplify/TaggedLineStringSimplifier.h
#ifdef _MSC_VER
#pragma warning(push)
-@@ -53,6 +54,7 @@
+@@ -53,6 +54,7 @@ namespace geos {
namespace geos {
namespace simplify { // geos::simplify
diff --git a/debian/patches/geos-config b/debian/patches/geos-config
index 068ec50..a27318b 100644
--- a/debian/patches/geos-config
+++ b/debian/patches/geos-config
@@ -1,8 +1,6 @@
-Index: geos/tools/geos-config.in
-===================================================================
---- geos.orig/tools/geos-config.in 2013-12-06 13:46:08.088287127 +0100
-+++ geos/tools/geos-config.in 2013-12-06 13:47:14.856441369 +0100
-@@ -43,7 +43,7 @@
+--- a/tools/geos-config.in
++++ b/tools/geos-config.in
+@@ -43,7 +43,7 @@ case $1 in
--libs)
# TODO: make an alias for --clibs
# see http://trac.osgeo.org/geos/ticket/497
diff --git a/debian/patches/libruby b/debian/patches/libruby
index 052821c..37b0abd 100644
--- a/debian/patches/libruby
+++ b/debian/patches/libruby
@@ -1,7 +1,5 @@
-Index: geos-3.4.2/swig/ruby/Makefile.in
-===================================================================
---- geos-3.4.2.orig/swig/ruby/Makefile.in 2014-02-13 02:46:17.805363739 +0100
-+++ geos-3.4.2/swig/ruby/Makefile.in 2014-02-13 02:46:17.797363820 +0100
+--- a/swig/ruby/Makefile.in
++++ b/swig/ruby/Makefile.in
@@ -334,7 +334,7 @@ MAINTAINERCLEANFILES = geos_wrap.cxx
# Build Ruby module as shared library
@ENABLE_RUBY_TRUE at rubyextensiondir_LTLIBRARIES = geos.la
@@ -11,10 +9,8 @@ Index: geos-3.4.2/swig/ruby/Makefile.in
# Only need to grab the capi header files
@ENABLE_RUBY_TRUE at geos_la_CPPFLAGS = -I$(top_builddir)/capi
-Index: geos-3.4.2/configure
-===================================================================
---- geos-3.4.2.orig/configure 2014-02-13 02:46:17.805363739 +0100
-+++ geos-3.4.2/configure 2014-02-13 02:46:17.801363780 +0100
+--- a/configure
++++ b/configure
@@ -17097,7 +17097,7 @@ fi
RUBY_LIB_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["libdir"] || Config::CONFIG["libdir"]'`
--
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