[DebianGIS-dev] r2332 - packages/geos/trunk/debian
frankie at alioth.debian.org
frankie at alioth.debian.org
Fri Jun 26 14:17:26 UTC 2009
Author: frankie
Date: 2009-06-26 14:17:24 +0000 (Fri, 26 Jun 2009)
New Revision: 2332
Added:
packages/geos/trunk/debian/control.in
packages/geos/trunk/debian/libgeos-c++.dirs
packages/geos/trunk/debian/libgeos-c++.install
Removed:
packages/geos/trunk/debian/libgeos-3.1.0.dirs
packages/geos/trunk/debian/libgeos-3.1.0.install
Modified:
packages/geos/trunk/debian/changelog
packages/geos/trunk/debian/control
packages/geos/trunk/debian/rules
Log:
Some changes for a more smart package.
Modified: packages/geos/trunk/debian/changelog
===================================================================
--- packages/geos/trunk/debian/changelog 2009-06-25 18:20:30 UTC (rev 2331)
+++ packages/geos/trunk/debian/changelog 2009-06-26 14:17:24 UTC (rev 2332)
@@ -1,9 +1,12 @@
geos (3.1.1-1) unstable; urgency=low
- * NOT YET RELEASED.
* New upstream release (bug fixes only).
+ * Added me as an uploader.
+ * Policy bumped to 3.8.2 (no changes).
+ * Introduced a debian/control.in template to version automagically
+ the C++ binding package and dependencies.
- -- Francesco Paolo Lovergine <frankie at debian.org> Fri, 19 Jun 2009 16:27:12 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org> Fri, 26 Jun 2009 14:28:42 +0200
geos (3.1.0-1) unstable; urgency=low
Modified: packages/geos/trunk/debian/control
===================================================================
--- packages/geos/trunk/debian/control 2009-06-25 18:20:30 UTC (rev 2331)
+++ packages/geos/trunk/debian/control 2009-06-26 14:17:24 UTC (rev 2332)
@@ -2,9 +2,9 @@
Section: science
Priority: optional
Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
-Uploaders: Fabio Tranchitella <kobold at debian.org>
+Uploaders: Fabio Tranchitella <kobold at debian.org>, Francesco Paolo Lovergine <frankie at debian.org>
Build-Depends: debhelper (>= 7), dpatch, doxygen, swig, ruby, ruby-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
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 +12,7 @@
Package: libgeos-dev
Section: libdevel
Architecture: any
-Depends: libgeos-3.1.0 (= ${binary:Version}), libgeos-c1 (= ${binary:Version})
+Depends: libgeos-3.1.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 +43,7 @@
This package contains the C library. A C++ library is provided
by the libgeos* package.
-Package: libgeos-3.1.0
+Package: libgeos-3.1.1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -77,9 +77,9 @@
This package contains the documentation for the GEOS API.
Package: libgeos-ruby1.8
-Section: interpreters
+Section: ruby
Architecture: any
-Depends: libgeos-3.1.0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libgeos-3.1.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
Added: packages/geos/trunk/debian/control.in
===================================================================
--- packages/geos/trunk/debian/control.in (rev 0)
+++ packages/geos/trunk/debian/control.in 2009-06-26 14:17:24 UTC (rev 2332)
@@ -0,0 +1,88 @@
+Source: geos
+Section: science
+Priority: optional
+Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
+Uploaders: Fabio Tranchitella <kobold at debian.org>, Francesco Paolo Lovergine <frankie at debian.org>
+Build-Depends: debhelper (>= 7), dpatch, doxygen, swig, ruby, ruby-dev
+Standards-Version: 3.8.2
+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
+
+Package: libgeos-dev
+Section: libdevel
+Architecture: any
+Depends: libgeos- at VERSION@ (= ${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
+ 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-c1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Geometry engine for Geographic Information Systems - C Library
+ 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.
+ Functions provided include:
+ .
+ * spatial predicates (based on the DE-9IM model),
+ * overlay functions (intersection, difference, union,
+ symmetric difference),
+ * buffer,
+ * convex hull,
+ * area and distance functions, and
+ * topological validity checking
+ .
+ This package contains the C library. A C++ library is provided
+ by the libgeos* package.
+
+Package: libgeos- at VERSION@
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Geometry engine for Geographic Information Systems - C++ Library
+ 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.
+ Functions provided include:
+ .
+ * spatial predicates (based on the DE-9IM model),
+ * overlay functions (intersection, difference, union,
+ symmetric difference),
+ * buffer,
+ * convex hull,
+ * area and distance functions, and
+ * topological validity checking
+ .
+ This package contains the C++ library. A C library is provided
+ by the libgeos-c* package.
+
+Package: libgeos-doc
+Section: doc
+Architecture: all
+Suggests: libgeos-dev (= ${binary:Version})
+Homepage: http://download.osgeo.org/geos/doxygen/
+Description: Documentation for the GEOS GIS geometry engine library
+ 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 documentation for the GEOS API.
+
+Package: libgeos-ruby1.8
+Section: ruby
+Architecture: any
+Depends: libgeos- at VERSION@ (= ${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.
Deleted: packages/geos/trunk/debian/libgeos-3.1.0.dirs
===================================================================
--- packages/geos/trunk/debian/libgeos-3.1.0.dirs 2009-06-25 18:20:30 UTC (rev 2331)
+++ packages/geos/trunk/debian/libgeos-3.1.0.dirs 2009-06-26 14:17:24 UTC (rev 2332)
@@ -1 +0,0 @@
-usr/lib
Deleted: packages/geos/trunk/debian/libgeos-3.1.0.install
===================================================================
--- packages/geos/trunk/debian/libgeos-3.1.0.install 2009-06-25 18:20:30 UTC (rev 2331)
+++ packages/geos/trunk/debian/libgeos-3.1.0.install 2009-06-26 14:17:24 UTC (rev 2332)
@@ -1 +0,0 @@
-usr/lib/libgeos-3*
Copied: packages/geos/trunk/debian/libgeos-c++.dirs (from rev 2293, packages/geos/trunk/debian/libgeos-3.1.0.dirs)
===================================================================
--- packages/geos/trunk/debian/libgeos-c++.dirs (rev 0)
+++ packages/geos/trunk/debian/libgeos-c++.dirs 2009-06-26 14:17:24 UTC (rev 2332)
@@ -0,0 +1 @@
+usr/lib
Copied: packages/geos/trunk/debian/libgeos-c++.install (from rev 2293, packages/geos/trunk/debian/libgeos-3.1.0.install)
===================================================================
--- packages/geos/trunk/debian/libgeos-c++.install (rev 0)
+++ packages/geos/trunk/debian/libgeos-c++.install 2009-06-26 14:17:24 UTC (rev 2332)
@@ -0,0 +1 @@
+usr/lib/libgeos-*
Modified: packages/geos/trunk/debian/rules
===================================================================
--- packages/geos/trunk/debian/rules 2009-06-25 18:20:30 UTC (rev 2331)
+++ packages/geos/trunk/debian/rules 2009-06-26 14:17:24 UTC (rev 2332)
@@ -16,6 +16,16 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+# Guessing geos version, which is required for C++ binding support
+VER_MAJOR=$(shell grep ^VERSION_MAJOR configure.in|cut -d= -f2)
+VER_MINOR=$(shell grep ^VERSION_MINOR configure.in|cut -d= -f2)
+VER_PATCH=$(shell grep ^VERSION_PATCH configure.in|cut -d= -f2)
+VER=$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
+ifeq (..,$(VER))
+$(error configure.in not found or version cannot be guessed)
+else
+$(info Guessed geos version is $(VER))
+endif
CFLAGS = -Wall -g
@@ -31,16 +41,10 @@
CONFFLAGS += --disable-inline
endif
-# shared library versions, option 1
-version=2.0.5
-major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+debian/control:
+ @sed -e 's/@VERSION@/$(VER)/' debian/control.in >$@
-config.status: configure
+config.status: debian/control configure
dh_testdir
# Add here commands to configure the package.
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -58,6 +62,8 @@
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(CONFFLAGS)
+ cp debian/libgeos-c++.install debian/libgeos-$(VER).install
+ cp debian/libgeos-c++.dirs debian/libgeos-$(VER).dirs
#Architecture
build: patch build-arch build-indep
@@ -82,6 +88,7 @@
[ -f config.sub.bak ] && mv config.sub.bak config.sub || true
[ -f config.guess.bak ] && mv config.guess.bak config.guess || true
dh_clean
+ rm -f debian/libgeos-$(VER).install debian/libgeos-$(VER).dirs
install: install-indep install-arch
install-indep:
@@ -131,6 +138,9 @@
dh_makeshlibs -V
dh_installdeb
dh_shlibdeps
+ for i in $$(grep ^Package: debian/control|cut -d' ' -f2); do \
+ echo "geos:Version=$(VER)" >> $$i.substvars; \
+ done
dh_gencontrol
dh_md5sums
dh_builddeb
@@ -144,4 +154,4 @@
$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch debian/control
More information about the Pkg-grass-devel
mailing list