[postgis] 04/04: Drop typo patches, applied upstream.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Wed Jan 6 23:13:00 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 e8511b6806c0914d4c9a99b8be8d14487e49943e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Jan 7 00:06:31 2016 +0100
Drop typo patches, applied upstream.
---
debian/changelog | 1 +
debian/patches/doesnt-typo.patch | 622 ---------------------------------------
debian/patches/isnt-typo.patch | 82 ------
debian/patches/series | 2 -
4 files changed, 1 insertion(+), 706 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a91f1c8..110a3c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
postgis (2.2.1+dfsg-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Drop typo patches, applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Wed, 06 Jan 2016 23:58:51 +0100
diff --git a/debian/patches/doesnt-typo.patch b/debian/patches/doesnt-typo.patch
deleted file mode 100644
index d574a0b..0000000
--- a/debian/patches/doesnt-typo.patch
+++ /dev/null
@@ -1,622 +0,0 @@
-Description: Fix "doesnt" typo, replace with "doesn't".
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/postgis/ticket/3408
-
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -66842,7 +66842,7 @@
-
- 2004-02-05 20:31 David Blasby <dblasby at gmail.com>
-
-- * [r443] postgis_proj.c: Optimized the curvature method (doesnt
-+ * [r443] postgis_proj.c: Optimized the curvature method (doesn't
- have to calculate e2)
-
- 2004-02-05 20:21 David Blasby <dblasby at gmail.com>
---- a/doc/po/de_DE/reference_accessor.xml.po
-+++ b/doc/po/de_DE/reference_accessor.xml.po
-@@ -2966,7 +2966,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_XMax('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_XMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3033,7 +3033,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_XMin('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_XMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3154,7 +3154,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_YMax('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_YMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3221,7 +3221,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_YMin('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_YMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3337,7 +3337,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_ZMax('LINESTRING(1 3 4, 5 6 7)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_ZMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3456,7 +3456,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_ZMin('LINESTRING(1 3 4, 5 6 7)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_ZMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
---- a/doc/po/es/reference_accessor.xml.po
-+++ b/doc/po/es/reference_accessor.xml.po
-@@ -3745,7 +3745,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_XMax('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_XMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3812,7 +3812,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_XMin('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_XMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3933,7 +3933,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_YMax('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_YMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -4000,7 +4000,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_YMin('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_YMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -4116,7 +4116,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_ZMax('LINESTRING(1 3 4, 5 6 7)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_ZMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -4235,7 +4235,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_ZMin('LINESTRING(1 3 4, 5 6 7)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_ZMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
---- a/doc/po/fr/reference_accessor.xml.po
-+++ b/doc/po/fr/reference_accessor.xml.po
-@@ -3664,7 +3664,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_XMax('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_XMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3760,7 +3760,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_XMin('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_XMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3786,7 +3786,7 @@ msgstr ""
- "representation to a BOX3D\n"
- "SELECT ST_XMin('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_XMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3924,7 +3924,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_YMax('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_YMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3995,7 +3995,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_YMin('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_YMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -4119,7 +4119,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_ZMax('LINESTRING(1 3 4, 5 6 7)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_ZMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -4244,7 +4244,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_ZMin('LINESTRING(1 3 4, 5 6 7)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_ZMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
---- a/doc/po/it_IT/reference_accessor.xml.po
-+++ b/doc/po/it_IT/reference_accessor.xml.po
-@@ -3606,7 +3606,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_XMax('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_XMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3633,7 +3633,7 @@ msgstr ""
- "\n"
- "SELECT ST_XMax('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_XMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3701,7 +3701,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_XMin('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_XMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3727,7 +3727,7 @@ msgstr ""
- "automatico della rappresentazione della stringa a un BOX3D\n"
- "SELECT ST_XMin('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_XMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3865,7 +3865,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_YMax('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_YMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3891,7 +3891,7 @@ msgstr ""
- "automatico della rappresentazione della stringa a un BOX3D\n"
- "SELECT ST_YMax('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_YMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3961,7 +3961,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_YMin('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_YMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3987,7 +3987,7 @@ msgstr ""
- "representation to a BOX3D\n"
- "SELECT ST_YMin('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_YMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -4108,7 +4108,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_ZMax('LINESTRING(1 3 4, 5 6 7)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_ZMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -4251,7 +4251,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_ZMin('LINESTRING(1 3 4, 5 6 7)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_ZMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -4278,7 +4278,7 @@ msgstr ""
- "\n"
- "SELECT ST_ZMin('LINESTRING(1 3 4, 5 6 7)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_ZMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
---- a/doc/po/ko_KR/reference_accessor.xml.po
-+++ b/doc/po/ko_KR/reference_accessor.xml.po
-@@ -2966,7 +2966,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_XMax('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_XMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3033,7 +3033,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_XMin('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_XMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3154,7 +3154,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_YMax('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_YMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3221,7 +3221,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_YMin('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_YMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3337,7 +3337,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_ZMax('LINESTRING(1 3 4, 5 6 7)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_ZMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3456,7 +3456,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_ZMin('LINESTRING(1 3 4, 5 6 7)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_ZMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
---- a/doc/po/pl/reference_accessor.xml.po
-+++ b/doc/po/pl/reference_accessor.xml.po
-@@ -2967,7 +2967,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_XMax('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_XMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3034,7 +3034,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_XMin('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_XMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3155,7 +3155,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_YMax('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_YMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3222,7 +3222,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_YMin('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_YMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3338,7 +3338,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_ZMax('LINESTRING(1 3 4, 5 6 7)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_ZMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3457,7 +3457,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_ZMin('LINESTRING(1 3 4, 5 6 7)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_ZMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
---- a/doc/po/pt_BR/reference_accessor.xml.po
-+++ b/doc/po/pt_BR/reference_accessor.xml.po
-@@ -3123,7 +3123,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_XMax('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_XMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3192,7 +3192,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_XMin('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_XMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3316,7 +3316,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_YMax('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_YMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3385,7 +3385,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_YMin('LINESTRING(1 3, 5 6)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_YMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3512,7 +3512,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_ZMax('LINESTRING(1 3 4, 5 6 7)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_ZMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
-@@ -3633,7 +3633,7 @@ msgid ""
- "representation to a BOX3D\n"
- "SELECT ST_ZMin('LINESTRING(1 3 4, 5 6 7)');\n"
- "\n"
--"--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+"--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_ZMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 "
- "2,220227 150406 3)'));\n"
---- a/doc/po/templates/reference_accessor.xml.pot
-+++ b/doc/po/templates/reference_accessor.xml.pot
-@@ -2419,7 +2419,7 @@ msgid ""
- "--Observe THIS DOES NOT WORK because it will try to autocast the string representation to a BOX3D\n"
- "SELECT ST_XMax('LINESTRING(1 3, 5 6)');\n"
- "\n"
-- "--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+ "--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_XMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 2,220227 150406 3)'));\n"
- "st_xmax\n"
-@@ -2478,7 +2478,7 @@ msgid ""
- "--Observe THIS DOES NOT WORK because it will try to autocast the string representation to a BOX3D\n"
- "SELECT ST_XMin('LINESTRING(1 3, 5 6)');\n"
- "\n"
-- "--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+ "--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_XMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 2,220227 150406 3)'));\n"
- "st_xmin\n"
-@@ -2584,7 +2584,7 @@ msgid ""
- "--Observe THIS DOES NOT WORK because it will try to autocast the string representation to a BOX3D\n"
- "SELECT ST_YMax('LINESTRING(1 3, 5 6)');\n"
- "\n"
-- "--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+ "--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_YMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 2,220227 150406 3)'));\n"
- "st_ymax\n"
-@@ -2643,7 +2643,7 @@ msgid ""
- "--Observe THIS DOES NOT WORK because it will try to autocast the string representation to a BOX3D\n"
- "SELECT ST_YMin('LINESTRING(1 3, 5 6)');\n"
- "\n"
-- "--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+ "--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_YMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 2,220227 150406 3)'));\n"
- "st_ymin\n"
-@@ -2743,7 +2743,7 @@ msgid ""
- "--Observe THIS DOES NOT WORK because it will try to autocast the string representation to a BOX3D\n"
- "SELECT ST_ZMax('LINESTRING(1 3 4, 5 6 7)');\n"
- "\n"
-- "--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+ "--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_ZMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 2,220227 150406 3)'));\n"
- "st_zmax\n"
-@@ -2850,7 +2850,7 @@ msgid ""
- "--Observe THIS DOES NOT WORK because it will try to autocast the string representation to a BOX3D\n"
- "SELECT ST_ZMin('LINESTRING(1 3 4, 5 6 7)');\n"
- "\n"
-- "--ERROR: BOX3D parser - doesnt start with BOX3D(\n"
-+ "--ERROR: BOX3D parser - doesn't start with BOX3D(\n"
- "\n"
- "SELECT ST_ZMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 2,220227 150406 3)'));\n"
- "st_zmin\n"
---- a/doc/reference_accessor.xml
-+++ b/doc/reference_accessor.xml
-@@ -2360,7 +2360,7 @@ st_xmax
- --Observe THIS DOES NOT WORK because it will try to autocast the string representation to a BOX3D
- SELECT ST_XMax('LINESTRING(1 3, 5 6)');
-
----ERROR: BOX3D parser - doesnt start with BOX3D(
-+--ERROR: BOX3D parser - doesn't start with BOX3D(
-
- SELECT ST_XMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 2,220227 150406 3)'));
- st_xmax
-@@ -2428,7 +2428,7 @@ st_xmin
- --Observe THIS DOES NOT WORK because it will try to autocast the string representation to a BOX3D
- SELECT ST_XMin('LINESTRING(1 3, 5 6)');
-
----ERROR: BOX3D parser - doesnt start with BOX3D(
-+--ERROR: BOX3D parser - doesn't start with BOX3D(
-
- SELECT ST_XMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 2,220227 150406 3)'));
- st_xmin
-@@ -2552,7 +2552,7 @@ st_ymax
- --Observe THIS DOES NOT WORK because it will try to autocast the string representation to a BOX3D
- SELECT ST_YMax('LINESTRING(1 3, 5 6)');
-
----ERROR: BOX3D parser - doesnt start with BOX3D(
-+--ERROR: BOX3D parser - doesn't start with BOX3D(
-
- SELECT ST_YMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 2,220227 150406 3)'));
- st_ymax
-@@ -2620,7 +2620,7 @@ st_ymin
- --Observe THIS DOES NOT WORK because it will try to autocast the string representation to a BOX3D
- SELECT ST_YMin('LINESTRING(1 3, 5 6)');
-
----ERROR: BOX3D parser - doesnt start with BOX3D(
-+--ERROR: BOX3D parser - doesn't start with BOX3D(
-
- SELECT ST_YMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 2,220227 150406 3)'));
- st_ymin
-@@ -2737,7 +2737,7 @@ st_zmax
- --Observe THIS DOES NOT WORK because it will try to autocast the string representation to a BOX3D
- SELECT ST_ZMax('LINESTRING(1 3 4, 5 6 7)');
-
----ERROR: BOX3D parser - doesnt start with BOX3D(
-+--ERROR: BOX3D parser - doesn't start with BOX3D(
-
- SELECT ST_ZMax(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 2,220227 150406 3)'));
- st_zmax
-@@ -2865,7 +2865,7 @@ st_zmin
- --Observe THIS DOES NOT WORK because it will try to autocast the string representation to a BOX3D
- SELECT ST_ZMin('LINESTRING(1 3 4, 5 6 7)');
-
----ERROR: BOX3D parser - doesnt start with BOX3D(
-+--ERROR: BOX3D parser - doesn't start with BOX3D(
-
- SELECT ST_ZMin(ST_GeomFromEWKT('CIRCULARSTRING(220268 150415 1,220227 150505 2,220227 150406 3)'));
- st_zmin
---- a/extras/tiger_geocoder/normalize/normalize_address.sql
-+++ b/extras/tiger_geocoder/normalize/normalize_address.sql
-@@ -194,7 +194,7 @@ BEGIN
-
- -- Pull out the full street information, defined as everything between the
- -- address and the state. This includes the location.
-- -- This doesnt need to be done if location has already been found.
-+ -- This doesn't need to be done if location has already been found.
- IF result.location IS NULL THEN
- IF addressString IS NOT NULL THEN
- IF state IS NOT NULL THEN
-@@ -708,4 +708,4 @@ BEGIN
- END
- $$
- LANGUAGE plpgsql IMMUTABLE STRICT
-- COST 100;
-\ No newline at end of file
-+ COST 100;
---- a/postgis/lwgeom_box3d.c
-+++ b/postgis/lwgeom_box3d.c
-@@ -63,7 +63,7 @@ Datum BOX3D_in(PG_FUNCTION_ARGS)
- if (strstr(str,"BOX3D(") != str )
- {
- pfree(box);
-- elog(ERROR,"BOX3D parser - doesnt start with BOX3D(");
-+ elog(ERROR,"BOX3D parser - doesn't start with BOX3D(");
- PG_RETURN_NULL();
- }
-
---- a/postgis/lwgeom_spheroid.c
-+++ b/postgis/lwgeom_spheroid.c
-@@ -76,7 +76,7 @@ Datum ellipsoid_in(PG_FUNCTION_ARGS)
-
- if (strstr(str,"SPHEROID") != str )
- {
-- elog(ERROR,"SPHEROID parser - doesnt start with SPHEROID");
-+ elog(ERROR,"SPHEROID parser - doesn't start with SPHEROID");
- pfree(sphere);
- PG_RETURN_NULL();
- }
-@@ -374,7 +374,7 @@ Datum LWGEOM_length_ellipsoid_linestring
- }
-
- /*
-- * For some lat/long points, the above method doesnt calculate the distance very well.
-+ * For some lat/long points, the above method doesn't calculate the distance very well.
- * Typically this is for two lat/long points that are very very close together (<10cm).
- * This gets worse closer to the equator.
- *
diff --git a/debian/patches/isnt-typo.patch b/debian/patches/isnt-typo.patch
deleted file mode 100644
index 9e45c3d..0000000
--- a/debian/patches/isnt-typo.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Description: Fix "isnt" typo, replace with "isn't".
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/postgis/ticket/3408
-
---- a/postgis/lwgeom_functions_analytic.c
-+++ b/postgis/lwgeom_functions_analytic.c
-@@ -140,13 +140,13 @@ Datum LWGEOM_line_interpolate_point(PG_F
-
- if ( distance < 0 || distance > 1 )
- {
-- elog(ERROR,"line_interpolate_point: 2nd arg isnt within [0,1]");
-+ elog(ERROR,"line_interpolate_point: 2nd arg isn't within [0,1]");
- PG_RETURN_NULL();
- }
-
- if ( gserialized_get_type(gser) != LINETYPE )
- {
-- elog(ERROR,"line_interpolate_point: 1st arg isnt a line");
-+ elog(ERROR,"line_interpolate_point: 1st arg isn't a line");
- PG_RETURN_NULL();
- }
-
-@@ -480,13 +480,13 @@ Datum LWGEOM_line_substring(PG_FUNCTION_
-
- if ( from < 0 || from > 1 )
- {
-- elog(ERROR,"line_interpolate_point: 2nd arg isnt within [0,1]");
-+ elog(ERROR,"line_interpolate_point: 2nd arg isn't within [0,1]");
- PG_RETURN_NULL();
- }
-
- if ( to < 0 || to > 1 )
- {
-- elog(ERROR,"line_interpolate_point: 3rd arg isnt within [0,1]");
-+ elog(ERROR,"line_interpolate_point: 3rd arg isn't within [0,1]");
- PG_RETURN_NULL();
- }
-
-@@ -602,7 +602,7 @@ Datum LWGEOM_line_substring(PG_FUNCTION_
- }
- else
- {
-- elog(ERROR,"line_substring: 1st arg isnt a line");
-+ elog(ERROR,"line_substring: 1st arg isn't a line");
- PG_RETURN_NULL();
- }
-
---- a/postgis/lwgeom_functions_basic.c
-+++ b/postgis/lwgeom_functions_basic.c
-@@ -2408,13 +2408,13 @@ Datum optimistic_overlap(PG_FUNCTION_ARG
-
- if (geom1->type != POLYGONTYPE)
- {
-- elog(ERROR,"optimistic_overlap: first arg isnt a polygon\n");
-+ elog(ERROR,"optimistic_overlap: first arg isn't a polygon\n");
- PG_RETURN_NULL();
- }
-
- if (geom2->type != POLYGONTYPE && geom2->type != MULTIPOLYGONTYPE)
- {
-- elog(ERROR,"optimistic_overlap: 2nd arg isnt a [multi-]polygon\n");
-+ elog(ERROR,"optimistic_overlap: 2nd arg isn't a [multi-]polygon\n");
- PG_RETURN_NULL();
- }
-
---- a/postgis/lwgeom_functions_lrs.c
-+++ b/postgis/lwgeom_functions_lrs.c
-@@ -215,12 +215,12 @@ Datum LWGEOM_line_locate_point(PG_FUNCTI
-
- if ( gserialized_get_type(geom1) != LINETYPE )
- {
-- elog(ERROR,"line_locate_point: 1st arg isnt a line");
-+ elog(ERROR,"line_locate_point: 1st arg isn't a line");
- PG_RETURN_NULL();
- }
- if ( gserialized_get_type(geom2) != POINTTYPE )
- {
-- elog(ERROR,"line_locate_point: 2st arg isnt a point");
-+ elog(ERROR,"line_locate_point: 2st arg isn't a point");
- PG_RETURN_NULL();
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index 2f1fccf..b6bbddc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
link-liblwgeom
-doesnt-typo.patch
-isnt-typo.patch
--
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