The following commit has been merged in the upstream branch: commit c39c3c1b4821e31e249db11102e8bc9f1682cb7c Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Wed Feb 22 14:27:07 2012 +0100
Merged NMU for #641387 diff --git a/debian/changelog b/debian/changelog index 791d3be..cb85ff8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,8 +10,14 @@ geos (3.3.1-1) unstable; urgency=low 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> Wed, 22 Feb 2012 10:57:57 +0100 + * The libgeos++-dev package depends on libgeos-dev for a couple of reasons: + - a common header (geos/extern.h) + - a program using C++ API could mixup C and C++ APIs so better being + safe about that. + * Merged NMU change in debian/rules to fix armhf FTBS. + (closes: #641387) + + -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 22 Feb 2012 14:20:57 +0100 geos (3.2.2-3) unstable; urgency=low diff --git a/debian/control b/debian/control index 7b907fd..fa96776 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,7 @@ Description: Geometry engine for GIS - Development files Package: libgeos++-dev Section: libdevel Architecture: any -Depends: libgeos-3.3.1 (= ${binary:Version}), ${misc:Depends} +Depends: libgeos-3.3.1 (= ${binary:Version}), libgeos-dev, ${misc:Depends} Suggests: libgdal-doc Breaks: libgeos-dev (<< 3.3.1-1~) Description: Geometry engine for GIS - C++ development files diff --git a/debian/control.in b/debian/control.in index a3842dd..e3a2c24 100644 --- a/debian/control.in +++ b/debian/control.in @@ -25,7 +25,7 @@ Description: Geometry engine for GIS - Development files Package: libgeos++-dev Section: libdevel Architecture: any -Depends: libgeos-@VERSION@ (= ${binary:Version}), ${misc:Depends} +Depends: libgeos-@VERSION@ (= ${binary:Version}), libgeos-dev, ${misc:Depends} Suggests: libgdal-doc Breaks: libgeos-dev (<< 3.3.1-1~) Description: Geometry engine for GIS - C++ development files diff --git a/debian/rules b/debian/rules index a818b17..3a1fc5c 100755 --- a/debian/rules +++ b/debian/rules @@ -36,7 +36,8 @@ endif ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif -ifeq ($(DEB_HOST_GNU_TYPE),arm-linux-gnueabi) +# catch both armel and armhf +ifneq (,$(findstring arm-linux-gnueabi,$(DEB_HOST_GNU_TYPE))) CONFFLAGS += --disable-inline endif -- 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