[SCM] geos branch, master, updated. upstream/3.2.2-40-g86ad878
The following commit has been merged in the master branch: commit e9f5163f564dfa4b458a4089abb59f1f84266e98 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed Nov 30 18:12:55 2011 +0100 Removed superfluous dirs diff --git a/debian/libgeos++-dev.dirs b/debian/libgeos++-dev.dirs index 9a4ceb9..6845771 100644 --- a/debian/libgeos++-dev.dirs +++ b/debian/libgeos++-dev.dirs @@ -1,3 +1 @@ -usr/bin usr/lib -usr/include -- 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-40-g86ad878
The following commit has been merged in the master branch: commit 86ad87871942fc7ad8d91fc73e049e19316f2418 Author: Francesco Paolo Lovergine fran...@debian.org Date: Fri Dec 2 15:16:01 2011 +0100 Fixed .a file name for C++ diff --git a/debian/libgeos++-dev.install b/debian/libgeos++-dev.install index 5d285b9..fcc4dbe 100644 --- a/debian/libgeos++-dev.install +++ b/debian/libgeos++-dev.install @@ -1,2 +1,2 @@ -usr/lib/libgeos-*.a +usr/lib/libgeos*.a usr/lib/libgeos-*.so -- 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-40-g86ad878
The following commit has been merged in the master branch: commit ea73a63690bdababd3f0c73a7bb4a2fc3566625d Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed Nov 30 18:12:08 2011 +0100 Preparing 3.3.1 diff --git a/debian/changelog b/debian/changelog index d70d870..71c3858 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +geos (3.3.1-4) unstable; urgency=low + + * New upstream major release. +(closes: #648611) + * Changed the C/C++ chain for development. See NEWS file for an explanation. + + -- Francesco Paolo Lovergine fran...@debian.org Wed, 30 Nov 2011 17:01:19 +0100 + geos (3.2.2-3) unstable; urgency=low * New patch: swig. Fixed for strong version detection in ac_pkg_swig.m4. diff --git a/debian/control b/debian/control index 3662ee9..c4c9a4f 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,20 @@ 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}), ${misc:Depends} +Depends: 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 + functions. It implements the geometry model defined in the + OpenGIS Consortium Simple Features Specification for SQL. + . + This package contains the headers and libraries needed to + develop programs using GEOS. + +Package: libgeos++-dev +Section: libdevel +Architecture: any +Depends: libgeos-3.3.1 (= ${binary:Version}), ${misc:Depends} Suggests: libgdal-doc Description: Geometry engine for GIS - Development files GEOS provides a spatial object model and fundamental geometric @@ -43,7 +56,7 @@ Description: Geometry engine for Geographic Information Systems - C Library This package contains the C library. A C++ library is provided by the libgeos* package. -Package: libgeos-3.2.2 +Package: libgeos-3.3.1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -80,7 +93,7 @@ Description: Documentation for the GEOS GIS geometry engine library Package: libgeos-ruby1.8 Section: ruby Architecture: any -Depends: libgeos-3.2.2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: GEOS bindings for Ruby GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the @@ -92,7 +105,7 @@ Package: libgeos-dbg Architecture: any Section: debug Priority: extra -Depends: libgeos-3.2.2 (= ${binary:Version}), libgeos-c1 (= ${binary:Version}), ${misc:Depends} +Depends: libgeos-3.3.1 (= ${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 2cc578a..92579b0 100644 --- a/debian/control.in +++ b/debian/control.in @@ -12,7 +12,20 @@ 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}), ${misc:Depends} +Depends: 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 + functions. It implements the geometry model defined in the + OpenGIS Consortium Simple Features Specification for SQL. + . + This package contains the headers and libraries needed to + develop programs using GEOS. + +Package: libgeos++-dev +Section: libdevel +Architecture: any +Depends: libgeos-@VERSION@ (= ${binary:Version}), ${misc:Depends} Suggests: libgdal-doc Description: Geometry engine for GIS - Development files GEOS provides a spatial object model and fundamental geometric @@ -80,7 +93,7 @@ Description: Documentation for the GEOS GIS geometry engine library Package: libgeos-ruby1.8 Section: ruby Architecture: any -Depends: libgeos-@VERSION@ (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: GEOS bindings for Ruby GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the diff --git a/debian/libgeos-dev.install b/debian/libgeos-dev.install index 10e67e1..640cea9 100644 --- a/debian/libgeos-dev.install +++ b/debian/libgeos-dev.install @@ -1,4 +1,4 @@ usr/bin/geos-config usr/include/* -usr/lib/*.a -usr/lib/*.so +usr/lib/libgeos_c.a +usr/lib/libgeos_c.so -- Geometry engine for Geographic Information Systems ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org
[SCM] geos branch, master, updated. upstream/3.2.2-40-g86ad878
The following commit has been merged in the master branch: commit bb987fa3bbc246f6fcd3eee2b3dac27d4b75a792 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed Nov 30 18:12:30 2011 +0100 Added a new -dev package diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 000..7b73d22 --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,14 @@ +geos (3.3.1-4) unstable; urgency=low + + GEOS provides a (stable) C API and an unstable C++ one. Most programs use + the stable interface. See http://trac.osgeo.org/geos/wiki/Applications for + details. Starting from this version we are trying to short the list of + reverse build-deps that require erroneously linking both C/C++ and binary + NMUs. + + A program which depends on the C++ API has to b-depend on the libgeos++-dev + which in turn depends on the right libgeosVERSION lib. All + other programs has to b-depend on the C libgeos-dev package, which + depends only on the C stable interface (currently libgeos1). + + -- Francesco Paolo Lovergine fran...@debian.org Wed, 30 Nov 2011 17:27:23 +0100 diff --git a/debian/libgeos-dev.dirs b/debian/libgeos++-dev.dirs similarity index 100% copy from debian/libgeos-dev.dirs copy to debian/libgeos++-dev.dirs diff --git a/debian/libgeos++-dev.install b/debian/libgeos++-dev.install new file mode 100644 index 000..5d285b9 --- /dev/null +++ b/debian/libgeos++-dev.install @@ -0,0 +1,2 @@ +usr/lib/libgeos-*.a +usr/lib/libgeos-*.so -- 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-40-g86ad878
The following commit has been merged in the master branch: commit 5b65c8370b89b9989d16702092ea543143bc333d Author: Francesco Paolo Lovergine fran...@debian.org Date: Fri Dec 2 14:22:38 2011 +0100 Added a note about changes. diff --git a/debian/NEWS b/debian/NEWS index 7b73d22..2fdb5f6 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -7,8 +7,12 @@ geos (3.3.1-4) unstable; urgency=low NMUs. A program which depends on the C++ API has to b-depend on the libgeos++-dev - which in turn depends on the right libgeosVERSION lib. All - other programs has to b-depend on the C libgeos-dev package, which - depends only on the C stable interface (currently libgeos1). + which in turn depends on the right libgeos-VERSION lib. All + other programs have to b-depend on the C libgeos-dev package, which + depends strictly on the C stable interface (currently libgeos1). + + Note that geos-config has some problems on those regards, so current + version also provides the C lib only for --libs. + See http://trac.osgeo.org/geos/ticket/497 about that. -- Francesco Paolo Lovergine fran...@debian.org Wed, 30 Nov 2011 17:27:23 +0100 diff --git a/debian/changelog b/debian/changelog index 71c3858..764f51a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ geos (3.3.1-4) unstable; urgency=low * New upstream major release. (closes: #648611) * Changed the C/C++ chain for development. See NEWS file for an explanation. +(closes: #643658) -- Francesco Paolo Lovergine fran...@debian.org Wed, 30 Nov 2011 17:01:19 +0100 -- 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-40-g86ad878
The following commit has been merged in the master branch: commit abb70c74b157b68108e5cf85e4adef70a06f254a Author: Francesco Paolo Lovergine fran...@debian.org Date: Fri Dec 2 14:42:06 2011 +0100 Refreshed patches. diff --git a/debian/changelog b/debian/changelog index 764f51a..c2d1663 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ geos (3.3.1-4) unstable; urgency=low (closes: #648611) * Changed the C/C++ chain for development. See NEWS file for an explanation. (closes: #643658) + * Patches refreshed. - -- Francesco Paolo Lovergine fran...@debian.org Wed, 30 Nov 2011 17:01:19 +0100 + -- Francesco Paolo Lovergine fran...@debian.org Fri, 02 Dec 2011 14:41:49 +0100 geos (3.2.2-3) unstable; urgency=low diff --git a/debian/patches/AbstractNode.cpp b/debian/patches/AbstractNode.cpp index 0b2a2d9..0c4a61a 100644 --- a/debian/patches/AbstractNode.cpp +++ b/debian/patches/AbstractNode.cpp @@ -1,10 +1,10 @@ -Index: geos/source/index/strtree/AbstractNode.cpp +Index: geos/src/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 @@ - +--- geos.orig/src/index/strtree/AbstractNode.cpp 2011-11-30 16:54:52.0 +0100 geos/src/index/strtree/AbstractNode.cpp2011-12-02 14:40:01.0 +0100 +@@ -19,6 +19,7 @@ #include vector + #include cstddef #include cassert +#include cstddef diff --git a/debian/patches/Bintree.cpp b/debian/patches/Bintree.cpp index 801eb4d..118c15b 100644 --- a/debian/patches/Bintree.cpp +++ b/debian/patches/Bintree.cpp @@ -1,8 +1,8 @@ -Index: geos/source/index/bintree/Bintree.cpp +Index: geos/src/index/bintree/Bintree.cpp === 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 @@ +--- geos.orig/src/index/bintree/Bintree.cpp2011-11-30 16:54:52.0 +0100 geos/src/index/bintree/Bintree.cpp 2011-12-02 14:35:52.0 +0100 +@@ -19,6 +19,7 @@ #include geos/index/bintree/Root.h #include geos/index/bintree/Interval.h #include vector diff --git a/debian/patches/CoordinateSequenceFactory.h b/debian/patches/CoordinateSequenceFactory.h index 90b8669..a5a8a29 100644 --- a/debian/patches/CoordinateSequenceFactory.h +++ b/debian/patches/CoordinateSequenceFactory.h @@ -1,7 +1,7 @@ -Index: geos/source/headers/geos/geom/CoordinateSequenceFactory.h +Index: geos/include/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 +--- 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 @@ #include geos/export.h #include vector diff --git a/debian/patches/DirectedEdgeStar.h b/debian/patches/DirectedEdgeStar.h index 5422464..8221a4b 100644 --- a/debian/patches/DirectedEdgeStar.h +++ b/debian/patches/DirectedEdgeStar.h @@ -1,16 +1,16 @@ -Index: geos/source/headers/geos/planargraph/DirectedEdgeStar.h +Index: geos/include/geos/planargraph/DirectedEdgeStar.h === geos.orig/source/headers/geos/planargraph/DirectedEdgeStar.h 2011-05-25 15:32:28.0 +0200 -+++ geos/source/headers/geos/planargraph/DirectedEdgeStar.h2011-05-25 15:33:06.0 +0200 +--- 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 @@ #include geos/export.h #include vector +#include cstddef - // Forward declarations - namespace geos { -@@ -35,6 +36,8 @@ + #ifdef _MSC_VER + #pragma warning(push) +@@ -40,6 +41,8 @@ namespace geos { namespace planargraph { // geos.planargraph diff --git a/debian/patches/DouglasPeuckerLineSimplifier.h b/debian/patches/DouglasPeuckerLineSimplifier.h index 3396826..15caa11 100644 --- a/debian/patches/DouglasPeuckerLineSimplifier.h +++ b/debian/patches/DouglasPeuckerLineSimplifier.h @@ -1,16 +1,16 @@ -Index: geos/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h +Index: geos/include/geos/simplify/DouglasPeuckerLineSimplifier.h === geos.orig/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h 2011-05-25 16:11:31.0 +0200 -+++