The following commit has been merged in the upstream branch: commit ba5ae59015a3798ef26c46acb4b2fcd5ba96dc20 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Thu Apr 1 22:53:40 2010 +0000
Inital python binding support and new version. diff --git a/debian/changelog b/debian/changelog index deb55b1..a145edd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +geos (3.2.1-1) unstable; urgency=low + + * New upstream release. + * Added python bindings for all versions. + + -- Francesco Paolo Lovergine <fran...@debian.org> Fri, 02 Apr 2010 00:02:16 +0200 + geos (3.2.0-2) unstable; urgency=low * Policy set to 3.8.4, without changes. diff --git a/debian/control b/debian/control index c7614e1..44c63ae 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,10 @@ 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), dpatch, doxygen, swig, ruby, ruby-dev +Build-Depends: debhelper (>= 7), dpatch, doxygen, swig, ruby, ruby-dev, + python-dev, python-all-dev (>= 2.3.5-11~), python-central (>= 0.5) Standards-Version: 3.8.4 +XS-Python-Version: all Homepage: http://trac.osgeo.org/geos/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/geos/trunk Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/geos/trunk @@ -12,7 +14,7 @@ Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/geos/trunk Package: libgeos-dev Section: libdevel Architecture: any -Depends: libgeos-3.2.0 (= ${binary:Version}), libgeos-c1 (= ${binary:Version}) +Depends: libgeos-3.2.1 (= ${binary:Version}), libgeos-c1 (= ${binary:Version}) Suggests: libgdal-doc Description: Geometry engine for GIS - Development files GEOS provides a spatial object model and fundamental geometric @@ -43,7 +45,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.0 +Package: libgeos-3.2.1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -79,10 +81,23 @@ Description: Documentation for the GEOS GIS geometry engine library Package: libgeos-ruby1.8 Section: ruby Architecture: any -Depends: libgeos-3.2.0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: libgeos-3.2.1 (= ${binary:Version}), ${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 OpenGIS Consortium Simple Features Specification for SQL. . This package contains the Ruby bindings for GEOS. + +Package: python-geos +Section: python +Architecture: any +Depends: libgeos-3.2.1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: GEOS bindings for Python + 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 Python bindings for GEOS. diff --git a/debian/control.in b/debian/control.in index 0158e61..3a394c5 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,8 +3,10 @@ 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), dpatch, doxygen, swig, ruby, ruby-dev +Build-Depends: debhelper (>= 7), dpatch, doxygen, swig, ruby, ruby-dev, + python-dev, python-all-dev (>= 2.3.5-11~), python-central (>= 0.5) Standards-Version: 3.8.4 +XS-Python-Version: all Homepage: http://trac.osgeo.org/geos/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/geos/trunk Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/geos/trunk @@ -86,3 +88,16 @@ Description: GEOS bindings for Ruby OpenGIS Consortium Simple Features Specification for SQL. . This package contains the Ruby bindings for GEOS. + +Package: python-geos +Section: python +Architecture: any +Depends: libgeos-@VERSION@ (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: GEOS bindings for Python + 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 Python bindings for GEOS. diff --git a/debian/rules b/debian/rules index 38604d4..4157b6d 100755 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,9 @@ include /usr/share/dpatch/dpatch.make +PYVERS=$(shell pyversions -v -r debian/control.in) +PYDEF=$(shell pyversions -dv) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -55,13 +58,17 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" "" mv config.guess config.guess.bak cp -f /usr/share/misc/config.guess config.guess endif - CFLAGS="$(CFLAGS)" ./configure \ - --host=$(DEB_HOST_GNU_TYPE) \ - --build=$(DEB_BUILD_GNU_TYPE) \ - --enable-ruby \ - --prefix=/usr \ - --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info $(CONFFLAGS) + for V in $(PYVERS); do \ + CFLAGS="$(CFLAGS)" PYTHON=/usr/bin/python$$V ./configure \ + --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --enable-ruby \ + --enable-python \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info $(CONFFLAGS); \ + cp swig/python/Makefile swig/python/Makefile-$$V; \ + done cp debian/libgeos-c++.install debian/libgeos-$(VER).install cp debian/libgeos-c++.dirs debian/libgeos-$(VER).dirs @@ -72,6 +79,10 @@ build-arch: build-arch-stamp build-arch-stamp: config.status # Add here commands to compile the arch part of the package. $(MAKE) + for V in $(PYVERS); do \ + $(MAKE) -C swig/python clean; \ + PYTHON=/usr/bin/python$$V $(MAKE) -C swig/python -f Makefile-$$V; \ + done touch $@ build-indep: build-indep-stamp -- 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