The following commit has been merged in the upstream branch: commit fd2c0532127bc7ad446c35eeebfd2e9257a2da2d Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Wed Feb 22 12:04:01 2012 +0100
Now installs C++ headers in the correct package. diff --git a/debian/changelog b/debian/changelog index a27372c..791d3be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,17 @@ -geos (3.3.1-4) unstable; urgency=low +geos (3.3.1-1) unstable; urgency=low * New upstream major release. (closes: #648611) * Changed the C/C++ chain for development. See NEWS file for an explanation. + Thanks strk for a useful discussion about that. (closes: #643658) * Patches refreshed and merged with upstream changes. * Added patch geos-config to fix library paths. This is coherent with upstream approach too. + * Moved the C++ headers under libgeos++-dev automagically and added a break + against the old libgeos-dev all-in-one package. - -- Francesco Paolo Lovergine <fran...@debian.org> Tue, 21 Feb 2012 23:33:45 +0100 + -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 22 Feb 2012 10:57:57 +0100 geos (3.2.2-3) unstable; urgency=low diff --git a/debian/control b/debian/control index ea61bab..7b907fd 100644 --- a/debian/control +++ b/debian/control @@ -27,6 +27,7 @@ Section: libdevel Architecture: any Depends: libgeos-3.3.1 (= ${binary:Version}), ${misc:Depends} Suggests: libgdal-doc +Breaks: libgeos-dev (<< 3.3.1-1~) Description: Geometry engine for GIS - C++ development files GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the @@ -77,7 +78,8 @@ Description: Geometry engine for Geographic Information Systems - C++ Library * topological validity checking . This package contains the C++ library. A stable C library is provided - by the libgeos-c* package. + by the libgeos-c* package and should be preferred by third-parties + programs. Package: libgeos-doc Section: doc diff --git a/debian/control.in b/debian/control.in index 180cf88..a3842dd 100644 --- a/debian/control.in +++ b/debian/control.in @@ -27,6 +27,7 @@ Section: libdevel Architecture: any Depends: libgeos-@VERSION@ (= ${binary:Version}), ${misc:Depends} Suggests: libgdal-doc +Breaks: libgeos-dev (<< 3.3.1-1~) Description: Geometry engine for GIS - C++ development files GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the @@ -77,7 +78,8 @@ Description: Geometry engine for Geographic Information Systems - C++ Library * topological validity checking . This package contains the C++ library. A stable C library is provided - by the libgeos-c* package. + by the libgeos-c* package and should be preferred by third-parties + programs. Package: libgeos-doc Section: doc diff --git a/debian/libgeos++-dev.dirs b/debian/libgeos++-dev.dirs index 6845771..4418816 100644 --- a/debian/libgeos++-dev.dirs +++ b/debian/libgeos++-dev.dirs @@ -1 +1,2 @@ usr/lib +usr/include diff --git a/debian/libgeos++-dev.install b/debian/libgeos++-dev.install.in similarity index 100% rename from debian/libgeos++-dev.install rename to debian/libgeos++-dev.install.in diff --git a/debian/libgeos-dev.install b/debian/libgeos-dev.install index 640cea9..204ced0 100644 --- a/debian/libgeos-dev.install +++ b/debian/libgeos-dev.install @@ -1,4 +1,5 @@ usr/bin/geos-config -usr/include/* +usr/include/geos_c.h +usr/include/geos/export.h usr/lib/libgeos_c.a usr/lib/libgeos_c.so diff --git a/debian/rules b/debian/rules index 539a537..c37f083 100755 --- a/debian/rules +++ b/debian/rules @@ -86,7 +86,7 @@ clean: [ -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 + rm -f debian/libgeos-$(VER).install debian/libgeos-$(VER).dirs debian/libgeos++-dev.install install: install-indep install-arch install-indep: @@ -119,6 +119,9 @@ install-arch: cp -ax debian/tmp/usr/local/lib/site_ruby/1.8 \ debian/libgeos-ruby1.8/usr/lib/ruby/1.8 find debian/libgeos-ruby*/usr/lib/ruby -name "*.la" -delete || true + # add C++ headers to C++ dev package install file + cp debian/libgeos++dev.install.in debian/libgeos++dev.install + find debian/tmp/usr/include/geos -name "*.h" -a ! -name "export.h" | sed -e 's/^debian\/tmp\///' >>debian/libgeos++dev.install # Must not depend on anything. This is to be called by # binary-arch/binary-indep -- 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