[postgis] 04/05: Drop patches applied upstream, disable hppa.patch.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Wed Mar 23 00:22:55 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository postgis.
commit 3c2397888cba2c7e24ce47ebb644dcbb3560c30f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Mar 23 01:16:54 2016 +0100
Drop patches applied upstream, disable hppa.patch.
---
debian/changelog | 1 +
debian/patches/acquire-typo.patch | 26 ---------------
...-any-drift-of-cutter-point-on-lines-split.patch | 37 ----------------------
debian/patches/relax-test-timing-constraints.patch | 6 ++--
debian/patches/series | 5 +--
debian/patches/transform-typo.patch | 37 ----------------------
6 files changed, 5 insertions(+), 107 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0628e70..98575c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
postgis (2.2.2+dfsg-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Drop patches applied upstream, disable hppa.patch.
-- Bas Couwenberg <sebastic at debian.org> Wed, 23 Mar 2016 01:13:18 +0100
diff --git a/debian/patches/acquire-typo.patch b/debian/patches/acquire-typo.patch
deleted file mode 100644
index 648ecee..0000000
--- a/debian/patches/acquire-typo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Fix 'aquire' typo, replace with 'acquire'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/postgis/ticket/3449
-
---- a/extras/WFS_locks/WFS_locks.c
-+++ b/extras/WFS_locks/WFS_locks.c
-@@ -137,7 +137,7 @@ Datum check_authorization(PG_FUNCTION_AR
-
- SPIcode = SPI_exec(query,0);
- if (SPIcode != SPI_OK_SELECT )
-- elog(ERROR, "couldnt execute to test for lock aquire: %s", query);
-+ elog(ERROR, "couldnt execute to test for lock acquire: %s", query);
-
- if (SPI_processed >0)
- {
---- a/postgis/long_xact.c
-+++ b/postgis/long_xact.c
-@@ -143,7 +143,7 @@ Datum check_authorization(PG_FUNCTION_AR
-
- SPIcode = SPI_exec(query,0);
- if (SPIcode != SPI_OK_SELECT )
-- elog(ERROR, "couldnt execute to test for lock aquire: %s", query);
-+ elog(ERROR, "couldnt execute to test for lock acquire: %s", query);
-
- if (SPI_processed >0)
- {
diff --git a/debian/patches/avoid-any-drift-of-cutter-point-on-lines-split.patch b/debian/patches/avoid-any-drift-of-cutter-point-on-lines-split.patch
deleted file mode 100644
index 4eb230d..0000000
--- a/debian/patches/avoid-any-drift-of-cutter-point-on-lines-split.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Avoid any drift of cutter point on lines split.
- Should fix splitting operations on at least arm64, ppc64el and s390x.
- See #3422 and #3401 (for 2.2 branch)
-Author: Sandro Santilli <strk at keybit.net>
-Bug: https://trac.osgeo.org/postgis/ticket/3422
-Origin: https://trac.osgeo.org/postgis/changeset/14595
-
---- a/liblwgeom/lwgeom_geos_split.c
-+++ b/liblwgeom/lwgeom_geos_split.c
-@@ -258,6 +258,7 @@ lwline_split_by_point_to(const LWLINE* l
- {
- mindist = dist;
- seg=i;
-+ if ( mindist == 0.0 ) break; /* can't be closer than ON line */
- }
- p1 = p2;
- }
-@@ -273,11 +274,18 @@ lwline_split_by_point_to(const LWLINE* l
-
- /*
- * We need to project the
-- * point on the closest segment.
-+ * point on the closest segment,
-+ * to interpolate Z and M if needed
- */
- getPoint4d_p(ipa, seg, &p1);
- getPoint4d_p(ipa, seg+1, &p2);
- closest_point_on_segment(&pt, &p1, &p2, &pt_projected);
-+ /* But X and Y we want the ones of the input point,
-+ * as on some architectures the interpolation math moves the
-+ * coordinates (see #3422)
-+ */
-+ pt_projected.x = pt.x;
-+ pt_projected.y = pt.y;
-
- LWDEBUGF(3, "Projected point:(%g %g), seg:%d, p1:(%g %g), p2:(%g %g)", pt_projected.x, pt_projected.y, seg, p1.x, p1.y, p2.x, p2.y);
-
diff --git a/debian/patches/relax-test-timing-constraints.patch b/debian/patches/relax-test-timing-constraints.patch
index ab1f515..01d2025 100644
--- a/debian/patches/relax-test-timing-constraints.patch
+++ b/debian/patches/relax-test-timing-constraints.patch
@@ -7,7 +7,7 @@ Forwarded: no
--- a/regress/interrupt.sql
+++ b/regress/interrupt.sql
-@@ -24,7 +24,7 @@
+@@ -24,7 +24,7 @@ $$ LANGUAGE 'plpgsql' VOLATILE;
SET statement_timeout TO 100;
-- would run for many seconds if uninterruptible...
SELECT ST_Segmentize(ST_MakeLine(ST_Point(4,39), ST_Point(1,41)), 1e-100);
@@ -18,7 +18,7 @@ Forwarded: no
SELECT '1',ST_AsText(ST_Segmentize('LINESTRING(0 0,4 0)'::geometry, 2));
--- a/regress/interrupt_buffer.sql
+++ b/regress/interrupt_buffer.sql
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,7 @@ select ST_Buffer(g,100) from _inputs WHE
--( select (st_dumppoints(st_buffer(st_makepoint(0,0),10000,100000))).geom g) foo;
-- it may take some more to interrupt st_buffer, see
-- https://travis-ci.org/postgis/postgis/builds/40211116#L2222-L2223
@@ -29,7 +29,7 @@ Forwarded: no
SELECT '1', ST_NPoints(ST_Buffer('POINT(4 0)'::geometry, 2, 1));
--- a/regress/interrupt_relate.sql
+++ b/regress/interrupt_relate.sql
-@@ -36,30 +36,30 @@
+@@ -36,30 +36,30 @@ UPDATE _time SET t = now(); -- reset tim
SET statement_timeout TO 100;
select ST_Contains(g,g) from _inputs WHERE id = 1; -- 6+ seconds
diff --git a/debian/patches/series b/debian/patches/series
index b32a43c..3b2e677 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
link-liblwgeom
-hppa.patch
+#hppa.patch
relax-test-timing-constraints.patch
-avoid-any-drift-of-cutter-point-on-lines-split.patch
-acquire-typo.patch
-transform-typo.patch
diff --git a/debian/patches/transform-typo.patch b/debian/patches/transform-typo.patch
deleted file mode 100644
index b083971..0000000
--- a/debian/patches/transform-typo.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Fix 'tranform' typo, replace with 'transform'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/postgis/ticket/3449
-
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -51126,7 +51126,7 @@
-
- * Applied "Mark Cave-Ayland" <mark.cave-ayland at webbased.co.uk>'s
- patch so
-- transform() will correctly tranform BBOX only geometries.
-+ transform() will correctly transform BBOX only geometries.
-
- 2002-09-03 15:31 pramsey
-
---- a/doc/xsl/postgis_aggs_mm.xml.xsl
-+++ b/doc/xsl/postgis_aggs_mm.xml.xsl
-@@ -81,7 +81,7 @@
- <title>PostGIS Geography Support Functions</title>
- <para>The functions and operators given below are PostGIS functions/operators that take as input or return as output a <link linkend="PostGIS_Geography">geography</link> data type object.</para>
- <note><para>Functions with a (T) are not native geodetic functions, and use a ST_Transform call to and from geometry to do the operation. As a result, they may not behave as expected when going over dateline, poles,
-- and for large geometries or geometry pairs that cover more than one UTM zone. Basic tranform - (favoring UTM, Lambert Azimuthal (North/South), and falling back on mercator in worst case scenario)</para></note>
-+ and for large geometries or geometry pairs that cover more than one UTM zone. Basic transform - (favoring UTM, Lambert Azimuthal (North/South), and falling back on mercator in worst case scenario)</para></note>
- <itemizedlist>
- <!-- Pull out the purpose section for each ref entry and strip whitespace and put in a variable to be tagged unto each function comment -->
- <xsl:for-each select='//refentry'>
---- a/postgis/lwgeom_transform.c
-+++ b/postgis/lwgeom_transform.c
-@@ -114,7 +114,7 @@ Datum transform_geom(PG_FUNCTION_ARGS)
- result_srid = PG_GETARG_INT32(3);
- if (result_srid == SRID_UNKNOWN)
- {
-- elog(ERROR,"tranform: destination SRID = %d",SRID_UNKNOWN);
-+ elog(ERROR,"transform: destination SRID = %d",SRID_UNKNOWN);
- PG_RETURN_NULL();
- }
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis.git
More information about the Pkg-grass-devel
mailing list