[geos] 01/01: Merge changes from 3.5.1-4.
Bas Couwenberg
sebastic at debian.org
Tue Nov 28 20:22:32 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository geos.
commit 45d985e4b3ea0281aded11987964fd073da54c67
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Jan 20 15:57:11 2017 +0100
Merge changes from 3.5.1-4.
---
debian/changelog | 51 ++++++++++++++++++++++++++++++-----------
debian/control | 35 +++++++++-------------------
debian/control.in | 35 +++++++++-------------------
debian/rules | 11 ++++++---
debian/source.lintian-overrides | 3 +++
5 files changed, 70 insertions(+), 65 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a478ff5..fec2f05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,6 @@ geos (3.6.2-1) UNRELEASED; urgency=medium
* Merge changes from 3.5.1.
* Refresh patches.
* Update symbols for amd64.
- * Add autopkgtest to test installability.
- * Change priority for libgeos-dbg from extra to optional.
- * Bump Standards-Version to 4.1.0, changes: priority.
-- Bas Couwenberg <sebastic at debian.org> Tue, 25 Jul 2017 11:50:34 +0200
@@ -22,6 +19,32 @@ geos (3.6.0-1~exp1) experimental; urgency=medium
-- Bas Couwenberg <sebastic at debian.org> Tue, 25 Oct 2016 19:32:54 +0200
+geos (3.5.1-4) unstable; urgency=medium
+
+ * Ignore test failures on problematic architectures only.
+ * Strip trailing whitespace from changelog, control & rules files.
+ * Add patch to fix empty GEOSSimplify return on inner ring collapse.
+ * Change priority for libgeos-dbg from extra to optional.
+ * Bump Standards-Version to 4.1.1, changes: priority.
+ * Add lintian override for debian-watch-uses-insecure-uri.
+ * Drop obsolete dbg package.
+ * Add autopkgtest to test installability.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 28 Nov 2017 20:12:26 +0100
+
+geos (3.5.1-3) unstable; urgency=medium
+
+ * Fix architectures for getGeometryN(unsigned long) symbol.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 05 Nov 2016 10:09:15 +0100
+
+geos (3.5.1-2) unstable; urgency=medium
+
+ * Update symbols for other architectures.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 05 Nov 2016 08:57:24 +0100
+
geos (3.5.1-1) unstable; urgency=medium
* Use dh_install -a instead of deprecated --same-arch option.
@@ -163,7 +186,7 @@ geos (3.4.2-5) unstable; urgency=medium
geos (3.4.2-4) unstable; urgency=low
* Re-enable parallel builds, wasn't cause of testrunning failures.
- * Skip tests on troublesome architectures.
+ * Skip tests on troublesome architectures.
-- Bas Couwenberg <sebastic at xs4all.nl> Thu, 20 Mar 2014 08:44:52 +0100
@@ -206,7 +229,7 @@ geos (3.4.2-1.1) unstable; urgency=medium
geos (3.4.2-1) unstable; urgency=low
[ Markus Wanner and Francesco Paolo Lovergine ]
- * New upstream release.
+ * New upstream release.
(closes: #693694)
* Patches just refreshed.
@@ -257,7 +280,7 @@ geos (3.3.1-1) unstable; urgency=low
* 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
+ * Moved the C++ headers under libgeos++-dev automagically and added a break
against the old libgeos-dev all-in-one package.
* The libgeos++-dev package depends on libgeos-dev for a couple of reasons:
- a common header (geos/extern.h)
@@ -284,7 +307,7 @@ geos (3.2.2-2) unstable; urgency=low
* Added CoordinateSequenceFactory.h patch to fix a missing declaration.
(closes: #624949)
* Added Bintree.cpp, Node.cpp, MonotoneChainBuilder.h, AbstractNode.cpp,
- and other patches to fix a missing cstddef header file inclusion in
+ and other patches to fix a missing cstddef header file inclusion in
some files and use of std namespace. This is required in current
default gcc flavor.
* Use -fpermessive at building time to work around some minor compatibility
@@ -296,7 +319,7 @@ geos (3.2.2-1) unstable; urgency=low
[ Alan Boudreault ]
* New upstream release.
-
+
[ Francesco Paolo Lovergine ]
* Policy set to 3.9.1, without changes.
* Merged log for post squeeze release.
@@ -314,7 +337,7 @@ geos (3.2.0-1) unstable; urgency=low
* Removed kobold among uploaders because no more active on DebianGIS packages.
* Policy bumped to 3.8.3, without changes.
* Changed a bit debian/rules to manage RC patch version.
- * Now, it does not install libtool helper file .la, as currently deprecated.
+ * Now, it does not install libtool helper file .la, as currently deprecated.
* Revised licenses around and updated the debian/copyright file.
-- Francesco Paolo Lovergine <frankie at debian.org> Thu, 21 Jan 2010 17:05:45 +0100
@@ -324,7 +347,7 @@ geos (3.1.1-1) unstable; urgency=low
* 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
+ * Introduced a debian/control.in template to version automagically
the C++ binding package and dependencies.
-- Francesco Paolo Lovergine <frankie at debian.org> Fri, 26 Jun 2009 14:28:42 +0200
@@ -356,7 +379,7 @@ geos (3.0.3-1) unstable; urgency=low
* Watch file updated.
(closes: #504470)
* Patch gcc43.dpatch removed, merged upstream.
- * Moved to debhelper level 7.
+ * Moved to debhelper level 7.
* Some minor clean up in debian/rules.
[ Fabio Tranchitella ]
@@ -417,7 +440,7 @@ geos (2.2.3-4) unstable; urgency=low
* Switch to the new Homepage field
[ Francesco Paolo Lovergine ]
- * Fixed lintian error: debian-rules-ignores-make-clean-error
+ * Fixed lintian error: debian-rules-ignores-make-clean-error
-- Francesco Paolo Lovergine <frankie at debian.org> Wed, 17 Oct 2007 12:30:10 +0200
@@ -450,7 +473,7 @@ geos (2.2.1-1) unstable; urgency=low
* 2.2.1 introduces a new C API in the libgeos-c1 package
* Apply patch from Martin Michlmayr for FTBFS with g++
(Closes: #356111)
- * Don't put empty ChangeLog file in packages
+ * Don't put empty ChangeLog file in packages
[ Paul Wise ]
* Add homepages to the package descriptions.
@@ -485,7 +508,7 @@ geos (2.1.3-1) unstable; urgency=low
* New upstream release
* Renaming libgeos2 to libgeos2c2 for C++ ABI transition
- * Removed cp config.{guess,sub} from clean: target and
+ * Removed cp config.{guess,sub} from clean: target and
put it into configure target (change from ubuntu bug #11183)
-- Steve Halasz <debian at adkgis.org> Mon, 11 Jul 2005 11:17:32 -0400
diff --git a/debian/control b/debian/control
index f699073..4e91532 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,13 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
Bas Couwenberg <sebastic at debian.org>
Section: science
Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 9.20160114),
dh-autoreconf,
doxygen,
pkg-kde-tools,
ruby-all-dev,
swig
-Standards-Version: 4.1.0
+Standards-Version: 4.1.1
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/geos.git
Vcs-Git: https://anonscm.debian.org/git/pkg-grass/geos.git -b experimental
Homepage: https://trac.osgeo.org/geos/
@@ -24,9 +24,9 @@ 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.
+ OpenGIS Consortium Simple Features Specification for SQL.
.
- This package contains the headers and libraries needed to
+ This package contains the headers and libraries needed to
develop programs using GEOS.
Package: libgeos++-dev
@@ -40,11 +40,11 @@ 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
- OpenGIS Consortium Simple Features Specification for SQL.
+ OpenGIS Consortium Simple Features Specification for SQL.
.
- This package contains the headers and libraries needed to
+ This package contains the headers and libraries needed to
develop programs using GEOS in C++. Note that third-parties
- programs should use the stable C API instead of the
+ programs should use the stable C API instead of the
unstable C++ one.
Package: libgeos-c1v5
@@ -77,13 +77,13 @@ Section: libs
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.
+ 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,
+ * overlay functions (intersection, difference, union,
symmetric difference),
* buffer,
* convex hull,
@@ -123,16 +123,3 @@ Description: GEOS bindings for Ruby
.
This package contains the Ruby bindings for GEOS.
-Package: libgeos-dbg
-Architecture: any
-Section: debug
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libgeos-3.6.2 (= ${binary:Version}),
- libgeos-c1v5 (= ${binary:Version}),
- ${misc:Depends}
-Description: Debugging symbols for the GEOS 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 debugging symbols for C/C++ GEOS library.
diff --git a/debian/control.in b/debian/control.in
index 932e544..9d5fe3e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,13 +4,13 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
Bas Couwenberg <sebastic at debian.org>
Section: science
Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 9.20160114),
dh-autoreconf,
doxygen,
pkg-kde-tools,
ruby-all-dev,
swig
-Standards-Version: 4.1.0
+Standards-Version: 4.1.1
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/geos.git
Vcs-Git: https://anonscm.debian.org/git/pkg-grass/geos.git -b experimental
Homepage: https://trac.osgeo.org/geos/
@@ -24,9 +24,9 @@ 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.
+ OpenGIS Consortium Simple Features Specification for SQL.
.
- This package contains the headers and libraries needed to
+ This package contains the headers and libraries needed to
develop programs using GEOS.
Package: libgeos++-dev
@@ -40,11 +40,11 @@ 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
- OpenGIS Consortium Simple Features Specification for SQL.
+ OpenGIS Consortium Simple Features Specification for SQL.
.
- This package contains the headers and libraries needed to
+ This package contains the headers and libraries needed to
develop programs using GEOS in C++. Note that third-parties
- programs should use the stable C API instead of the
+ programs should use the stable C API instead of the
unstable C++ one.
Package: libgeos-c1v5
@@ -77,13 +77,13 @@ Section: libs
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.
+ 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,
+ * overlay functions (intersection, difference, union,
symmetric difference),
* buffer,
* convex hull,
@@ -123,16 +123,3 @@ Description: GEOS bindings for Ruby
.
This package contains the Ruby bindings for GEOS.
-Package: libgeos-dbg
-Architecture: any
-Section: debug
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libgeos- at VERSION@ (= ${binary:Version}),
- libgeos-c1v5 (= ${binary:Version}),
- ${misc:Depends}
-Description: Debugging symbols for the GEOS 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 debugging symbols for C/C++ GEOS library.
diff --git a/debian/rules b/debian/rules
index f44936f..dfc33ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,12 +32,12 @@ endif
CXX = g++ -fpermissive
-# catch both armel and armhf
+# catch both armel and armhf
ifneq (,$(findstring arm-linux-gnueabi,$(DEB_HOST_GNU_TYPE)))
CONFFLAGS += --disable-inline
endif
-debian/control:
+debian/control:
@sed -e 's/@VERSION@/$(VER)/' debian/control.in >$@
%:
@@ -64,7 +64,12 @@ override_dh_auto_build-indep:
$(MAKE) -C doc doxygen-html
override_dh_auto_test:
+# Ignore test failures on problematic architectures only
+ifneq (,$(findstring $(DEB_BUILD_ARCH),"arm64 armel armhf mips mips64el mipsel ppc64el s390x powerpc ppc64"))
dh_auto_test || echo "Ignoring test failures"
+else
+ dh_auto_test
+endif
override_dh_install-arch:
# add C++ headers to C++ dev package install file
@@ -103,7 +108,7 @@ override_dh_installman:
dh_installman -plibgeos-dev debian/geos-config.1
override_dh_strip:
- dh_strip --dbg-package=libgeos-dbg
+ dh_strip --dbgsym-migration='libgeos-dbg (<< 3.5.1-4~)'
override_dh_makeshlibs:
dh_makeshlibs -- -v$(VER) -c0
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..e74b23a
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1,3 @@
+# download.osgeo.org is not available via HTTPS
+geos source: debian-watch-uses-insecure-uri *
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/geos.git
More information about the Pkg-grass-devel
mailing list