The following commit has been merged in the master branch: commit b09393f84162bf7c7dfb74631375a978332a5223 Author: Francesco Paolo Lovergine <fran...@debian.org> 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 <mar...@bluegap.ch> Wed, 02 Oct 2013 13:41:07 +0200 + -- Francesco Paolo Lovergine <fran...@debian.org> 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.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 @@ +--- 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 +@@ -23,7 +23,7 @@ #include <geos/export.h> #include <vector> 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.000000000 +0100 -+++ geos/include/geos/planargraph/DirectedEdgeStar.h 2011-12-02 14:40:45.000000000 +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 <geos/export.h> #include <vector> @@ -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.000000000 +0100 -+++ geos/include/geos/simplify/DouglasPeuckerLineSimplifier.h 2011-12-02 14:40:59.000000000 +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 <geos/export.h> #include <vector> #include <memory> // 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.000000000 +0100 -+++ geos/src/index/bintree/Node.cpp 2011-12-02 14:36:08.000000000 +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.cpp 2013-12-06 13:43:50.447970756 +0100 +@@ -15,6 +15,7 @@ #include <cstddef> #include <cassert> @@ -10,7 +10,7 @@ Index: geos/src/index/bintree/Node.cpp #include <geos/index/bintree/Node.h> #include <geos/index/bintree/Key.h> -@@ -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 =================================================================== ---- 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 @@ +--- 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 +@@ -33,6 +33,7 @@ #include <sstream> #include <vector> #include <algorithm> @@ -31,7 +31,7 @@ Index: geos/src/geomgraph/Node.cpp #ifndef GEOS_DEBUG #define GEOS_DEBUG 0 -@@ -40,12 +41,13 @@ +@@ -41,12 +42,13 @@ #define COMPUTE_Z 1 #endif @@ -48,9 +48,9 @@ Index: geos/src/geomgraph/Node.cpp : Index: geos/src/index/quadtree/Node.cpp =================================================================== ---- 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 @@ +--- 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 +@@ -24,6 +24,7 @@ #include <string> #include <sstream> #include <cassert> @@ -58,7 +58,7 @@ Index: geos/src/index/quadtree/Node.cpp #ifndef GEOS_DEBUG #define GEOS_DEBUG 0 -@@ -41,6 +42,8 @@ +@@ -40,6 +41,8 @@ namespace index { // geos.index namespace quadtree { // geos.index.quadtree diff --git a/debian/patches/Root.cpp b/debian/patches/Root.cpp index 88d6635..4f37350 100644 --- a/debian/patches/Root.cpp +++ b/debian/patches/Root.cpp @@ -1,8 +1,8 @@ Index: geos/src/index/bintree/Root.cpp =================================================================== ---- 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 @@ +--- 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 +@@ -20,11 +20,14 @@ #include <cstddef> #include <cassert> @@ -19,9 +19,9 @@ Index: geos/src/index/bintree/Root.cpp void Index: geos/src/index/quadtree/Root.cpp =================================================================== ---- 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 @@ +--- 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 +@@ -24,6 +24,7 @@ #include <geos/geom/Envelope.h> #include <cassert> @@ -29,7 +29,7 @@ Index: geos/src/index/quadtree/Root.cpp #ifndef GEOS_DEBUG #define GEOS_DEBUG 0 -@@ -40,6 +41,8 @@ +@@ -39,6 +40,8 @@ namespace index { // geos.index namespace quadtree { // geos.index.quadtree diff --git a/debian/patches/SimpleNestedRingTester.h b/debian/patches/SimpleNestedRingTester.h index 5375c39..38bb16e 100644 --- a/debian/patches/SimpleNestedRingTester.h +++ b/debian/patches/SimpleNestedRingTester.h @@ -1,8 +1,8 @@ Index: geos/include/geos/operation/valid/SimpleNestedRingTester.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 @@ +--- 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 +@@ -24,6 +24,7 @@ #include <cstddef> #include <vector> @@ -10,7 +10,7 @@ Index: geos/include/geos/operation/valid/SimpleNestedRingTester.h #ifdef _MSC_VER #pragma warning(push) -@@ -46,6 +47,8 @@ +@@ -45,6 +46,8 @@ namespace operation { // geos::operation namespace valid { // geos::operation::valid diff --git a/debian/patches/TaggedLineString.cpp b/debian/patches/TaggedLineString.cpp index 38faa85..8ab1464 100644 --- a/debian/patches/TaggedLineString.cpp +++ b/debian/patches/TaggedLineString.cpp @@ -1,8 +1,8 @@ Index: geos/src/simplify/TaggedLineString.cpp =================================================================== ---- 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 @@ +--- 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 +@@ -26,6 +26,7 @@ #include <cassert> #include <memory> @@ -10,7 +10,7 @@ Index: geos/src/simplify/TaggedLineString.cpp #ifndef GEOS_DEBUG #define GEOS_DEBUG 0 -@@ -42,6 +43,8 @@ +@@ -41,6 +42,8 @@ namespace geos { namespace simplify { // geos::simplify diff --git a/debian/patches/TaggedLineString.h b/debian/patches/TaggedLineString.h index 37dbf5a..8180d7a 100644 --- a/debian/patches/TaggedLineString.h +++ b/debian/patches/TaggedLineString.h @@ -1,8 +1,8 @@ Index: geos/include/geos/simplify/TaggedLineString.h =================================================================== ---- 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 @@ +--- 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 +@@ -28,6 +28,7 @@ #include <geos/export.h> #include <vector> #include <memory> @@ -10,7 +10,7 @@ Index: geos/include/geos/simplify/TaggedLineString.h #ifdef _MSC_VER #pragma warning(push) -@@ -52,6 +53,7 @@ +@@ -51,6 +52,7 @@ namespace geos { namespace simplify { // geos::simplify diff --git a/debian/patches/TaggedLineStringSimplifier.h b/debian/patches/TaggedLineStringSimplifier.h index 0e254d9..e5d1235 100644 --- a/debian/patches/TaggedLineStringSimplifier.h +++ b/debian/patches/TaggedLineStringSimplifier.h @@ -1,8 +1,8 @@ Index: geos/include/geos/simplify/TaggedLineStringSimplifier.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 @@ +--- 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 +@@ -28,6 +28,7 @@ #include <cstddef> #include <vector> #include <memory> @@ -10,7 +10,7 @@ Index: geos/include/geos/simplify/TaggedLineStringSimplifier.h #ifdef _MSC_VER #pragma warning(push) -@@ -54,6 +55,7 @@ +@@ -53,6 +54,7 @@ namespace geos { namespace simplify { // geos::simplify diff --git a/debian/patches/geos-config b/debian/patches/geos-config index 5fb9af5..068ec50 100644 --- a/debian/patches/geos-config +++ b/debian/patches/geos-config @@ -1,11 +1,11 @@ Index: geos/tools/geos-config.in =================================================================== ---- geos.orig/tools/geos-config.in 2012-05-23 15:30:18.000000000 +0200 -+++ geos/tools/geos-config.in 2012-05-23 15:37:54.000000000 +0200 -@@ -38,7 +38,7 @@ - echo -I${prefix}/include - ;; +--- 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 @@ --libs) + # TODO: make an alias for --clibs + # see http://trac.osgeo.org/geos/ticket/497 - echo -L${libdir} -lgeos + echo -L${libdir} -lgeos-@VERSION@ ;; -- 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