Bas Couwenberg pushed to branch master at Debian GIS Project / postgis
Commits:
408d1b0b by Bas Couwenberg at 2018-02-22T22:21:44+01:00
Drop patch to fix FTBFS with proj 5.0.0, fixed in proj 5.0.0-rc4.
- - - - -
47047b4c by Bas Couwenberg at 2018-02-22T22:47:47+01:00
Build-Depend on postgresql-all in control.in too.
- - - - -
d8a5b1a9 by Bas Couwenberg at 2018-02-22T22:47:58+01:00
Set distribution to unstable.
- - - - -
4 changed files:
- debian/changelog
- debian/control.in
- debian/patches/series
- − debian/patches/svn-r16382-pj_transform-Reset-pj_errno-after-any-error.patch
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-postgis (2.4.3+dfsg-4) UNRELEASED; urgency=medium
+postgis (2.4.3+dfsg-4) unstable; urgency=medium
* Update watch file to use HTTPS.
+ * Drop patch to fix FTBFS with proj 5.0.0, fixed in proj 5.0.0-rc4.
+ * Build-Depend on postgresql-all in control.in too.
- -- Bas Couwenberg <sebastic at debian.org> Sat, 17 Feb 2018 17:56:54 +0100
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 22 Feb 2018 22:47:48 +0100
postgis (2.4.3+dfsg-3) unstable; urgency=medium
=====================================
debian/control.in
=====================================
--- a/debian/control.in
+++ b/debian/control.in
@@ -27,7 +27,7 @@ Build-Depends: autoconf2.13,
# libsfcgal-dev [!armel],
libxml2-dev (>= 2.5.0~),
po-debconf,
- postgresql,
+ postgresql-all,
postgresql-common (>= 148~),
postgresql-server-dev-all,
protobuf-c-compiler,
=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
link-liblwgeom
relax-test-timing-constraints.patch
autotools-pkg-config-macro-not-cross-compilation-safe.patch
-svn-r16382-pj_transform-Reset-pj_errno-after-any-error.patch
=====================================
debian/patches/svn-r16382-pj_transform-Reset-pj_errno-after-any-error.patch deleted
=====================================
--- a/debian/patches/svn-r16382-pj_transform-Reset-pj_errno-after-any-error.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: pj_transform: Reset pj_errno after any error.
-Author: Raúl Marín Rodríguez
-Origin: https://trac.osgeo.org/postgis/changeset/16382
-Bug: https://trac.osgeo.org/postgis/ticket/4016
-Bug-Debian: https://bugs.debian.org/889981
-
---- a/liblwgeom/lwgeom_transform.c
-+++ b/liblwgeom/lwgeom_transform.c
-@@ -130,7 +130,7 @@ lwgeom_transform(LWGEOM *geom, projPJ in
- int
- point4d_transform(POINT4D *pt, projPJ srcpj, projPJ dstpj)
- {
-- int* pj_errno_ref;
-+
- POINT4D orig_pt;
-
- /* Make a copy of the input point so we can report the original should an error occur */
-@@ -142,25 +142,25 @@ point4d_transform(POINT4D *pt, projPJ sr
-
- LWDEBUGF(4, "transforming POINT(%f %f) from '%s' to '%s'", orig_pt.x, orig_pt.y, pj_get_def(srcpj,0), pj_get_def(dstpj,0));
-
-- /* Perform the transform */
-- pj_transform(srcpj, dstpj, 1, 0, &(pt->x), &(pt->y), &(pt->z));
-+ if (pj_transform(srcpj, dstpj, 1, 0, &(pt->x), &(pt->y), &(pt->z)) != 0)
-+ {
-+ int* pj_errno_ref = pj_get_errno_ref();
-+ int pj_errno_val = *pj_errno_ref;
-
-- /* For NAD grid-shift errors, display an error message with an additional hint */
-- pj_errno_ref = pj_get_errno_ref();
-+ /* Force a reset of pj_errno to avoid future errors */
-+ *pj_errno_ref = 0;
-
-- if (*pj_errno_ref != 0)
-- {
-- if (*pj_errno_ref == -38)
-+ if (pj_errno_val == -38)
- {
- lwnotice("PostGIS was unable to transform the point because either no grid shift files were found, or the point does not lie within the range for which the grid shift is defined. Refer to the ST_Transform() section of the PostGIS manual for details on how to configure PostGIS to alter this behaviour.");
- lwerror("transform: couldn't project point (%g %g %g): %s (%d)",
-- orig_pt.x, orig_pt.y, orig_pt.z, pj_strerrno(*pj_errno_ref), *pj_errno_ref);
-+ orig_pt.x, orig_pt.y, orig_pt.z, pj_strerrno(pj_errno_val), pj_errno_val);
- return 0;
- }
- else
- {
- lwerror("transform: couldn't project point (%g %g %g): %s (%d)",
-- orig_pt.x, orig_pt.y, orig_pt.z, pj_strerrno(*pj_errno_ref), *pj_errno_ref);
-+ orig_pt.x, orig_pt.y, orig_pt.z, pj_strerrno(pj_errno_val), pj_errno_val);
- return 0;
- }
- }
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/compare/35a996cc57803b0694dde95d36354d1f1e19a556...d8a5b1a99f3ecd1a85382d0c8b49980b6822c090
---
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/compare/35a996cc57803b0694dde95d36354d1f1e19a556...d8a5b1a99f3ecd1a85382d0c8b49980b6822c090
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20180222/43609d8d/attachment-0001.html>