The following commit has been merged in the master branch:
commit b09393f84162bf7c7dfb74631375a978332a5223
Author: Francesco Paolo Lovergine
Date: Fri Dec 6 13:51:24 2013 +0100
Patches refreshed for 3.4.2
diff --git a/debian/changelog b/debian/changelog
index be10c76..90f1993 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-geos (3.3.9-1) unstable; urgency=low
+geos (3.4.2-1) unstable; urgency=low
- [ Markus Wanner ]
- * New upstream release. Closes: #693694.
- * Team upload.
+ [ Markus Wanner and Francesco Paolo Lovergine ]
+ * New upstream release.
+(closes: #693694)
+ * Patches just refreshed.
[ Bas Couwenberg ]
* Build-depend on autotools-dev so that the config.guess/config.sub update
@@ -10,7 +11,7 @@ geos (3.3.9-1) unstable; urgency=low
(closes: #726455)
* Update watch file, handle common mistakes.
- -- Markus Wanner Wed, 02 Oct 2013 13:41:07 +0200
+ -- Francesco Paolo Lovergine Fri, 06 Dec 2013 13:48:39
+0100
geos (3.3.3-1.1) unstable; urgency=low
diff --git a/debian/patches/CoordinateSequenceFactory.h
b/debian/patches/CoordinateSequenceFactory.h
index a5a8a29..45b17f1 100644
--- a/debian/patches/CoordinateSequenceFactory.h
+++ b/debian/patches/CoordinateSequenceFactory.h
@@ -1,8 +1,8 @@
Index: geos/include/geos/geom/CoordinateSequenceFactory.h
===
geos.orig/include/geos/geom/CoordinateSequenceFactory.h2011-05-24
15:51:50.0 +0200
-+++ geos/include/geos/geom/CoordinateSequenceFactory.h 2011-05-24
15:51:53.0 +0200
-@@ -24,7 +24,7 @@
+--- geos.orig/include/geos/geom/CoordinateSequenceFactory.h2013-12-06
13:43:33.267931420 +0100
geos/include/geos/geom/CoordinateSequenceFactory.h 2013-12-06
13:43:33.263931411 +0100
+@@ -23,7 +23,7 @@
#include
#include
diff --git a/debian/patches/DirectedEdgeStar.h
b/debian/patches/DirectedEdgeStar.h
index 8221a4b..604393b 100644
--- a/debian/patches/DirectedEdgeStar.h
+++ b/debian/patches/DirectedEdgeStar.h
@@ -1,8 +1,8 @@
Index: geos/include/geos/planargraph/DirectedEdgeStar.h
===
geos.orig/include/geos/planargraph/DirectedEdgeStar.h 2011-11-30
16:54:52.0 +0100
-+++ geos/include/geos/planargraph/DirectedEdgeStar.h 2011-12-02
14:40:45.0 +0100
-@@ -20,6 +20,7 @@
+--- 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
+@@ -19,6 +19,7 @@
#include
#include
@@ -10,7 +10,7 @@ Index: geos/include/geos/planargraph/DirectedEdgeStar.h
#ifdef _MSC_VER
#pragma warning(push)
-@@ -40,6 +41,8 @@
+@@ -39,6 +40,8 @@
namespace geos {
namespace planargraph { // geos.planargraph
diff --git a/debian/patches/DouglasPeuckerLineSimplifier.h
b/debian/patches/DouglasPeuckerLineSimplifier.h
index 15caa11..5403e6e 100644
--- a/debian/patches/DouglasPeuckerLineSimplifier.h
+++ b/debian/patches/DouglasPeuckerLineSimplifier.h
@@ -1,8 +1,8 @@
Index: geos/include/geos/simplify/DouglasPeuckerLineSimplifier.h
===
geos.orig/include/geos/simplify/DouglasPeuckerLineSimplifier.h
2011-11-30 16:54:52.0 +0100
-+++ geos/include/geos/simplify/DouglasPeuckerLineSimplifier.h 2011-12-02
14:40:59.0 +0100
-@@ -23,6 +23,7 @@
+--- 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
+@@ -22,6 +22,7 @@
#include
#include
#include // for auto_ptr
@@ -10,7 +10,7 @@ Index:
geos/include/geos/simplify/DouglasPeuckerLineSimplifier.h
#ifdef _MSC_VER
#pragma warning(push)
-@@ -39,6 +40,8 @@
+@@ -38,6 +39,8 @@
namespace geos {
namespace simplify { // geos::simplify
diff --git a/debian/patches/Node.cpp b/debian/patches/Node.cpp
index 7b16feb..31c8b77 100644
--- a/debian/patches/Node.cpp
+++ b/debian/patches/Node.cpp
@@ -1,8 +1,8 @@
Index: geos/src/index/bintree/Node.cpp
===
geos.orig/src/index/bintree/Node.cpp 2011-11-30 16:54:52.0
+0100
-+++ geos/src/index/bintree/Node.cpp2011-12-02 14:36:08.0 +0100
-@@ -16,6 +16,7 @@
+--- geos.orig/src/index/bintree/Node.cpp 2013-12-06 13:43:50.727971397
+0100
geos/src/index/bintree/Node.cpp2013-12-06 13:43:50.447970756 +0100
+@@ -15,6 +15,7 @@
#include
#include
@@ -10,7 +10,7 @@ Index: geos/src/index/bintree/Node.cpp
#include
#include
-@@ -25,6 +26,8 @@
+@@ -24,6 +25,8 @@
namespace index { // geos.index
namespace bintree { // geos.index.bintree
@@ -21,9 +21,9 @@ Index: geos/src/index/bintree/Node.cpp
{
Index: geos/src/geomgraph/Node.cpp
===