The following commit has been merged in the upstream branch: commit 29536deca7b6b5a6257c544e7f5a6b7b87818d68 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Tue May 24 15:53:42 2011 +0200
Fixating #624949 diff --git a/debian/changelog b/debian/changelog index ccb43b1..7806e54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +geos (3.2.2-2) unstable; urgency=low + + * Policy bumped to 3.9.2, no changes. + * Fixed previous changelog entry. + * Added CoordinateSequenceFactory.h patch to fix a missing declaration. + (closes: #624949) + + -- Francesco Paolo Lovergine <fran...@debian.org> Tue, 24 May 2011 15:52:18 +0200 + geos (3.2.2-1) unstable; urgency=low [ Alan Boudreault ] @@ -8,7 +17,6 @@ geos (3.2.2-1) unstable; urgency=low * Merged log for post squeeze release. * Repository moved to git and changed Vcs-* fields as required. * Source format moved to 3.0 with quilt support. - * Policy changed to 3.9.1, without changes. * Added ${misc:Depends} to bin pkgs due to dh use. * Added -dbg package for debugging symbols. (closes: #582273) diff --git a/debian/compat b/debian/compat index 7f8f011..45a4fb7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +8 diff --git a/debian/control b/debian/control index 82bd00f..c820c9d 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,9 @@ Section: science Priority: optional Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Francesco Paolo Lovergine <fran...@debian.org> -Build-Depends: debhelper (>= 7), doxygen, swig, ruby, ruby-dev, +Build-Depends: debhelper (>= 8), doxygen, swig, ruby, ruby-dev, python-all, python-all-dev, python-central (>= 0.5) -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: http://trac.osgeo.org/geos/ Vcs-Browser: http://git.debian.org/?p=pkg-grass/geos.git Vcs-Git: git://git.debian.org/git/pkg-grass/geos diff --git a/debian/control.in b/debian/control.in index e328330..5784870 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,9 +3,9 @@ Section: science Priority: optional Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Francesco Paolo Lovergine <fran...@debian.org> -Build-Depends: debhelper (>= 7), doxygen, swig, ruby, ruby-dev, +Build-Depends: debhelper (>= 8), doxygen, swig, ruby, ruby-dev, python-all, python-all-dev, python-central (>= 0.5) -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: http://trac.osgeo.org/geos/ Vcs-Browser: http://git.debian.org/?p=pkg-grass/geos.git Vcs-Git: git://git.debian.org/git/pkg-grass/geos diff --git a/debian/patches/CoordinateSequenceFactory.h b/debian/patches/CoordinateSequenceFactory.h new file mode 100644 index 0000000..90b8669 --- /dev/null +++ b/debian/patches/CoordinateSequenceFactory.h @@ -0,0 +1,13 @@ +Index: geos/source/headers/geos/geom/CoordinateSequenceFactory.h +=================================================================== +--- geos.orig/source/headers/geos/geom/CoordinateSequenceFactory.h 2011-05-24 15:51:50.000000000 +0200 ++++ geos/source/headers/geos/geom/CoordinateSequenceFactory.h 2011-05-24 15:51:53.000000000 +0200 +@@ -24,7 +24,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/series b/debian/patches/series index e69de29..c0bb399 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +CoordinateSequenceFactory.h -- 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