[postgis] 02/03: Drop a few more patches that got applied upstream. All patches now apply cleanly.
Markus Wanner
markus_wanner-guest at moszumanska.debian.org
Mon Mar 31 07:27:06 UTC 2014
This is an automated email from the git hooks/post-receive script.
markus_wanner-guest pushed a commit to branch master
in repository postgis.
commit 28fbd0d8dbb5b623f2d85246aaaffdce8c0f65ff
Author: Markus Wanner <markus at bluegap.ch>
Date: Mon Mar 31 09:11:03 2014 +0200
Drop a few more patches that got applied upstream. All patches now
apply cleanly.
---
debian/changelog | 3 +-
debian/control | 170 ++++++++++++++++++++++++++++++++++++++-
debian/patches/doc-resources | 28 -------
debian/patches/fix-big-endian | 58 -------------
debian/patches/joinsel-issue2543 | 6 +-
debian/patches/series | 2 -
6 files changed, 174 insertions(+), 93 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 38723c3..83449f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,8 @@ postgis (2.1.2-1) UNRELEASED; urgency=medium
* Add a suggestion for postgis-doc. Closes: #737497.
* Refresh patches debian-versions, honor-build-flags, and
java-version-fix.
- * Drop patch/fix-kfreebsd, got applied upstream.
+ * Drop patches fix-kfreebsd, fix-big-endian, and doc-resources - these
+ got applied upstream.
-- Markus Wanner <markus at bluegap.ch> Sun, 30 Mar 2014 15:32:25 +0200
diff --git a/debian/control b/debian/control
index c8a973b..8a5087b 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-grass/postgis.git
Package: postgis
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: postgresql-9.3-postgis-2.1
+Suggests: postgresql-9.3-postgis-2.1, postgis-doc
Description: Geographic objects support for PostgreSQL
PostGIS adds support for geographic objects to the PostgreSQL
object-relational database. In effect, PostGIS "spatially enables"
@@ -101,6 +101,174 @@ Description: PostGIS "Lightweight Geometry" library - Development files
processing functions, are implemented here. This package contains
the development files.
+Package: postgresql-9.0-postgis-2.1
+Depends: ${shlibs:Depends}, postgresql-9.0,
+ postgresql-9.0-postgis-scripts, liblwgeom-2.1.1,
+ ${misc:Depends}
+Recommends: postgis, postgresql-contrib-9.0
+Breaks: postgis (<< 1.2.1)
+Architecture: any
+Description: Geographic objects support for PostgreSQL 9.0
+ PostGIS adds support for geographic objects to the PostgreSQL
+ object-relational database. In effect, PostGIS "spatially enables"
+ the PostgreSQL server, allowing it to be used as a backend spatial
+ database for geographic information systems (GIS), much like ESRI's
+ SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
+ "Simple Features Specification for SQL".
+ .
+ This package supports PostgreSQL 9.0.
+
+Package: postgresql-9.0-postgis-scripts
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: postgresql-9.0-postgis-2.1
+Replaces: postgresql-9.0-postgis-2.0-scripts (<< 2.1.0~),
+ postgresql-9.0-postgis-2.1-scripts (<< 2.1.0-4~)
+Breaks: postgresql-9.0-postgis-2.0-scripts (<< 2.1.0~),
+ postgresql-9.0-postgis-2.1-scripts (<< 2.1.0-4~)
+Description: Geographic objects support for PostgreSQL 9.0 -- scripts
+ PostGIS adds support for geographic objects to the PostgreSQL
+ object-relational database. In effect, PostGIS "spatially enables"
+ the PostgreSQL server, allowing it to be used as a backend spatial
+ database for geographic information systems (GIS), much like ESRI's
+ SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
+ "Simple Features Specification for SQL".
+ .
+ This package contains SQL scripts to upgrade from earlier PostGIS
+ versions for PostgreSQL 9.0 as well as Perl utility scripts.
+
+Package: postgresql-9.0-postgis-2.1-scripts
+Architecture: all
+Depends: ${misc:Depends}
+Description: PostGIS for PostgreSQL 9.0 -- scripts -- dummy package
+ This package contained SQL scripts to upgrade from earlier PostGIS
+ versions for PostgreSQL 9.0 as well as Perl utility scripts.
+ It got renamed to postgresql-9.0-postgis-scripts.
+ .
+ This is a transitional dummy package. It can safely be removed.
+
+Package: postgresql-9.0-postgis-2.0-scripts
+Architecture: all
+Depends: ${misc:Depends}
+Description: PostGIS 2.0 for PostgreSQL 9.0 -- scripts -- dummy package
+ This package contained the scripts for PostGIS version 2.0, that's
+ now deprecated. It extended PostgreSQL 9.0.
+ .
+ This is a transitional dummy package. It can safely be removed
+ together with the dependent postgresql-9.0-postgis package.
+
+Package: postgresql-9.1-postgis-2.1
+Depends: ${shlibs:Depends}, postgresql-9.1,
+ postgresql-9.1-postgis-scripts, liblwgeom-2.1.1,
+ ${misc:Depends}
+Recommends: postgis, postgresql-contrib-9.1
+Breaks: postgis (<< 1.2.1)
+Architecture: any
+Description: Geographic objects support for PostgreSQL 9.1
+ PostGIS adds support for geographic objects to the PostgreSQL
+ object-relational database. In effect, PostGIS "spatially enables"
+ the PostgreSQL server, allowing it to be used as a backend spatial
+ database for geographic information systems (GIS), much like ESRI's
+ SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
+ "Simple Features Specification for SQL".
+ .
+ This package supports PostgreSQL 9.1.
+
+Package: postgresql-9.1-postgis-scripts
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: postgresql-9.1-postgis-2.1
+Replaces: postgresql-9.1-postgis-2.0-scripts (<< 2.1.0~),
+ postgresql-9.1-postgis-2.1-scripts (<< 2.1.0-4~)
+Breaks: postgresql-9.1-postgis-2.0-scripts (<< 2.1.0~),
+ postgresql-9.1-postgis-2.1-scripts (<< 2.1.0-4~)
+Description: Geographic objects support for PostgreSQL 9.1 -- scripts
+ PostGIS adds support for geographic objects to the PostgreSQL
+ object-relational database. In effect, PostGIS "spatially enables"
+ the PostgreSQL server, allowing it to be used as a backend spatial
+ database for geographic information systems (GIS), much like ESRI's
+ SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
+ "Simple Features Specification for SQL".
+ .
+ This package contains SQL scripts to upgrade from earlier PostGIS
+ versions for PostgreSQL 9.1 as well as Perl utility scripts.
+
+Package: postgresql-9.1-postgis-2.1-scripts
+Architecture: all
+Depends: ${misc:Depends}
+Description: PostGIS for PostgreSQL 9.1 -- scripts -- dummy package
+ This package contained SQL scripts to upgrade from earlier PostGIS
+ versions for PostgreSQL 9.1 as well as Perl utility scripts.
+ It got renamed to postgresql-9.1-postgis-scripts.
+ .
+ This is a transitional dummy package. It can safely be removed.
+
+Package: postgresql-9.1-postgis-2.0-scripts
+Architecture: all
+Depends: ${misc:Depends}
+Description: PostGIS 2.0 for PostgreSQL 9.1 -- scripts -- dummy package
+ This package contained the scripts for PostGIS version 2.0, that's
+ now deprecated. It extended PostgreSQL 9.1.
+ .
+ This is a transitional dummy package. It can safely be removed
+ together with the dependent postgresql-9.1-postgis package.
+
+Package: postgresql-9.2-postgis-2.1
+Depends: ${shlibs:Depends}, postgresql-9.2,
+ postgresql-9.2-postgis-scripts, liblwgeom-2.1.1,
+ ${misc:Depends}
+Recommends: postgis, postgresql-contrib-9.2
+Breaks: postgis (<< 1.2.1)
+Architecture: any
+Description: Geographic objects support for PostgreSQL 9.2
+ PostGIS adds support for geographic objects to the PostgreSQL
+ object-relational database. In effect, PostGIS "spatially enables"
+ the PostgreSQL server, allowing it to be used as a backend spatial
+ database for geographic information systems (GIS), much like ESRI's
+ SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
+ "Simple Features Specification for SQL".
+ .
+ This package supports PostgreSQL 9.2.
+
+Package: postgresql-9.2-postgis-scripts
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: postgresql-9.2-postgis-2.1
+Replaces: postgresql-9.2-postgis-2.0-scripts (<< 2.1.0~),
+ postgresql-9.2-postgis-2.1-scripts (<< 2.1.0-4~)
+Breaks: postgresql-9.2-postgis-2.0-scripts (<< 2.1.0~),
+ postgresql-9.2-postgis-2.1-scripts (<< 2.1.0-4~)
+Description: Geographic objects support for PostgreSQL 9.2 -- scripts
+ PostGIS adds support for geographic objects to the PostgreSQL
+ object-relational database. In effect, PostGIS "spatially enables"
+ the PostgreSQL server, allowing it to be used as a backend spatial
+ database for geographic information systems (GIS), much like ESRI's
+ SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
+ "Simple Features Specification for SQL".
+ .
+ This package contains SQL scripts to upgrade from earlier PostGIS
+ versions for PostgreSQL 9.2 as well as Perl utility scripts.
+
+Package: postgresql-9.2-postgis-2.1-scripts
+Architecture: all
+Depends: ${misc:Depends}
+Description: PostGIS for PostgreSQL 9.2 -- scripts -- dummy package
+ This package contained SQL scripts to upgrade from earlier PostGIS
+ versions for PostgreSQL 9.2 as well as Perl utility scripts.
+ It got renamed to postgresql-9.2-postgis-scripts.
+ .
+ This is a transitional dummy package. It can safely be removed.
+
+Package: postgresql-9.2-postgis-2.0-scripts
+Architecture: all
+Depends: ${misc:Depends}
+Description: PostGIS 2.0 for PostgreSQL 9.2 -- scripts -- dummy package
+ This package contained the scripts for PostGIS version 2.0, that's
+ now deprecated. It extended PostgreSQL 9.2.
+ .
+ This is a transitional dummy package. It can safely be removed
+ together with the dependent postgresql-9.2-postgis package.
+
Package: postgresql-9.3-postgis-2.1
Depends: ${shlibs:Depends}, postgresql-9.3,
postgresql-9.3-postgis-scripts, liblwgeom-2.1.1,
diff --git a/debian/patches/doc-resources b/debian/patches/doc-resources
deleted file mode 100644
index 3545912..0000000
--- a/debian/patches/doc-resources
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: add HTML documentation resources (CSS, images)
-Author: Andrew Harvey <andrew.harvey4 at gmail.com>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649352
-Last-Update: 2014-01-19
-
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -318,13 +318,17 @@
- rm -f $(DESTDIR)$(PGSQL_MANDIR)/man1/shp2pgsql.1
- rm -f $(DESTDIR)$(PGSQL_MANDIR)/man1/pgsql2shp.1
-
--docs-install: html/postgis.html
-- mkdir -p $(DESTDIR)$(PGSQL_DOCDIR)/postgis
-- $(INSTALL_DATA) html/postgis.html $(DESTDIR)$(PGSQL_DOCDIR)/postgis/postgis.html
-+docs-install: html/postgis.html html/style.css
-+ mkdir -p $(DESTDIR)$(PGSQL_DOCDIR)/postgis/images
-+ $(INSTALL_DATA) html/postgis.html $(DESTDIR)$(PGSQL_DOCDIR)/postgis/
-+ $(INSTALL_DATA) html/style.css $(DESTDIR)$(PGSQL_DOCDIR)/postgis/
-+ $(INSTALL_DATA) html/images/* $(DESTDIR)$(PGSQL_DOCDIR)/postgis/images/
- $(INSTALL_DATA) ../README.postgis $(DESTDIR)$(PGSQL_DOCDIR)/postgis/README.postgis
-
- docs-uninstall:
- rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/postgis.html
-+ rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/style.css
-+ rm -rf $(DESTDIR)$(PGSQL_DOCDIR)/postgis/images
- rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/README.postgis
-
- install: comments-install
diff --git a/debian/patches/fix-big-endian b/debian/patches/fix-big-endian
deleted file mode 100644
index 8d97683..0000000
--- a/debian/patches/fix-big-endian
+++ /dev/null
@@ -1,58 +0,0 @@
-Description: Fix big-endian testing
- Fix FTBFS on at least powerpc and mips by commenting out a few tests
- that check against a serialized representation, which is architecture
- dependent.
-Author: Markus Wanner <markus at bluegap.ch>
-Last-Update: 2014-01-18
-
---- a/regress/sql-mm-curvepoly.sql
-+++ b/regress/sql-mm-curvepoly.sql
-@@ -336,7 +336,9 @@
- SELECT 'valid ewkb curve polygon 3', ST_asEWKT(ST_GeomFromEWKB(decode('010a00000001000000010800000007000000ccdf061ad9f3614054093e6d99093ec0ab9085dbb6dd614081540229216040c0ebd7a828c33e62409bf026782a7e41c0000000c06bb2624000000020adb440c08e632f616ead6240c9f7b0bf1dd33dc09011eec0de4362407dd6672f76323ec0ccdf061ad9f3614054093e6d99093ec0', 'hex')));
- SELECT 'valid ewkb curve polygon 4', ST_asEWKT(ST_GeomFromEWKB(decode('010a00000002000000010800000007000000ccdf061ad9f3614054093e6d99093ec0ab9085dbb6dd614081540229216040c0ebd7a828c33e62409bf026782a7e41c0000000c06bb2624000000020adb440c08e632f616ead6240c9f7b0bf1dd33dc09011eec0de4362407dd6672f76323ec0ccdf061ad9f3614054093e6d99093ec00102000000060000006844c4fe011b6240342e2993e0423fc0d45daf9d93066240c4a0c305d62240c000000080ac31624000000020fbbe40c0000000e0107f6240000000c0a10440c04e1c0c14624c62 [...]
- SELECT 'valid ewkb curve polygon 5', ST_asEWKT(ST_GeomFromEWKB(decode('010a00000002000000010200000007000000ccdf061ad9f3614054093e6d99093ec0ab9085dbb6dd614081540229216040c0ebd7a828c33e62409bf026782a7e41c0000000c06bb2624000000020adb440c08e632f616ead6240c9f7b0bf1dd33dc09011eec0de4362407dd6672f76323ec0ccdf061ad9f3614054093e6d99093ec00109000000030000000108000000030000006844c4fe011b6240342e2993e0423fc0d45daf9d93066240c4a0c305d62240c000000080ac31624000000020fbbe40c001020000000200000000000080ac [...]
--SELECT 'valid curve 6', ST_GeomFromText('CURVEPOLYGON(COMPOUNDCURVE(CIRCULARSTRING(0 0,2 0, 2 1, 2 3, 4 3),(4 3, 4 5, 1 4, 0 0)), CIRCULARSTRING(1.7 1, 1.4 0.4, 1.7 1) )');
-+-- Tests 'valid curve 6' and 'valid curve 8' will also fail on big endian architectures
-+-- We need a way to handle multiple byte orderings
-+-- SELECT 'valid curve 6', ST_GeomFromText('CURVEPOLYGON(COMPOUNDCURVE(CIRCULARSTRING(0 0,2 0, 2 1, 2 3, 4 3),(4 3, 4 5, 1 4, 0 0)), CIRCULARSTRING(1.7 1, 1.4 0.4, 1.7 1) )');
- SELECT 'valid curve 7', ST_GeomFromText('CURVEPOLYGON(COMPOUNDCURVE(CIRCULARSTRING(0 0,2 0, 2 1, 2 3, 4 3),(4 3, 4 5, 1 4, 0 0)), (1.7 1, 1.4 0.4, 1.7 1) )');
--SELECT 'valid curve 8', ST_GeomFromText('CURVEPOLYGON(COMPOUNDCURVE(CIRCULARSTRING(0 0,2 0, 2 1, 2 3, 4 3),(4 3, 0 0)), CIRCULARSTRING(1.7 1, 1.4 0.4, 1.7 1) )');
-+-- SELECT 'valid curve 8', ST_GeomFromText('CURVEPOLYGON(COMPOUNDCURVE(CIRCULARSTRING(0 0,2 0, 2 1, 2 3, 4 3),(4 3, 0 0)), CIRCULARSTRING(1.7 1, 1.4 0.4, 1.7 1) )');
- SELECT 'null response', ST_NumPoints(ST_GeomFromEWKT('CURVEPOLYGON(COMPOUNDCURVE(CIRCULARSTRING(0 0,2 0, 2 1, 2 3, 4 3),(4 3, 4 5, 1 4, 0 0)), CIRCULARSTRING(1.7 1, 1.4 0.4, 1.7 1) )'));
---- a/regress/sql-mm-curvepoly_expected
-+++ b/regress/sql-mm-curvepoly_expected
-@@ -89,7 +89,5 @@
- valid ewkb curve polygon 3|CURVEPOLYGON(CIRCULARSTRING(143.620251668383 -30.0374973560768,142.928571472997 -32.751011968744,145.961323098919 -34.9856710615288,149.575653076172 -33.4115333557129,149.419724075848 -29.8246726805735,146.120941605547 -30.1971158627043,143.620251668383 -30.0374973560768))
- valid ewkb curve polygon 4|CURVEPOLYGON(CIRCULARSTRING(143.620251668383 -30.0374973560768,142.928571472997 -32.751011968744,145.961323098919 -34.9856710615288,149.575653076172 -33.4115333557129,149.419724075848 -29.8246726805735,146.120941605547 -30.1971158627043,143.620251668383 -30.0374973560768),(144.843993552527 -31.2612392402209,144.205519526017 -32.2721564488616,145.552307128906 -33.4920387268066,147.970809936523 -32.0361862182617,146.386972449926 -31.4740639157242,144.84399355252 [...]
- valid ewkb curve polygon 5|CURVEPOLYGON((143.620251668383 -30.0374973560768,142.928571472997 -32.751011968744,145.961323098919 -34.9856710615288,149.575653076172 -33.4115333557129,149.419724075848 -29.8246726805735,146.120941605547 -30.1971158627043,143.620251668383 -30.0374973560768),COMPOUNDCURVE(CIRCULARSTRING(144.843993552527 -31.2612392402209,144.205519526017 -32.2721564488616,145.552307128906 -33.4920387268066),(145.552307128906 -33.4920387268066,147.970809936523 -32.0361862182617 [...]
--valid curve 6|010A0000000200000001090000000200000001080000000500000000000000000000000000000000000000000000000000004000000000000000000000000000000040000000000000F03F00000000000000400000000000000840000000000000104000000000000008400102000000040000000000000000001040000000000000084000000000000010400000000000001440000000000000F03F000000000000104000000000000000000000000000000000010800000003000000333333333333FB3F000000000000F03F666666666666F63F9A9999999999D93F333333333333FB3F000000000000F03F
- ERROR: geometry requires more points
--valid curve 8|010A0000000200000001090000000200000001080000000500000000000000000000000000000000000000000000000000004000000000000000000000000000000040000000000000F03F00000000000000400000000000000840000000000000104000000000000008400102000000020000000000000000001040000000000000084000000000000000000000000000000000010800000003000000333333333333FB3F000000000000F03F666666666666F63F9A9999999999D93F333333333333FB3F000000000000F03F
- null response|
---- a/regress/empty.sql
-+++ b/regress/empty.sql
-@@ -123,13 +123,6 @@
- WITH inp AS (SELECT
- 'POLYGON EMPTY'::geometry as empty,
- 1 as n
-- ) SELECT 'ST_GeometryN(empty, n) == empty', ST_GeometryN(empty, n) FROM inp;
--WITH inp AS (SELECT
-- 'POLYGON EMPTY'::geometry as empty
-- ) SELECT 'ST_ExteriorRing(empty) == empty', ST_ExteriorRing(empty) FROM inp;
--WITH inp AS (SELECT
-- 'POLYGON EMPTY'::geometry as empty,
-- 1 as n
- ) SELECT 'ST_InteriorRingN(empty, n) == NULL', ST_InteriorRingN(empty, n) FROM inp;
- WITH inp AS (SELECT
- 'POLYGON EMPTY'::geometry as empty
---- a/regress/empty_expected
-+++ b/regress/empty_expected
-@@ -47,8 +47,6 @@
- ST_NRings(empty) == 0|0
- ST_NumPoints(empty) == 0|0
- ST_NPoints(empty) == 0|0
--ST_GeometryN(empty, n) == empty|010300000000000000
--ST_ExteriorRing(empty) == empty|010200000000000000
- ST_InteriorRingN(empty, n) == NULL|
- ST_Area(empty) == 0|0
- ST_Length(empty) == 0|0
diff --git a/debian/patches/joinsel-issue2543 b/debian/patches/joinsel-issue2543
index 93aea83..3210c0a 100644
--- a/debian/patches/joinsel-issue2543
+++ b/debian/patches/joinsel-issue2543
@@ -10,9 +10,9 @@ Last-Update: 2013-11-13
--- a/postgis/gserialized_estimate.c
+++ b/postgis/gserialized_estimate.c
-@@ -1075,6 +1075,10 @@
- */
- selectivity = val / ntuples_max;
+@@ -1081,6 +1081,10 @@
+ if ( selectivity > 1.0 )
+ selectivity = 1.0;
+ /* Guard against over-estimates :) */
+ if ( selectivity > 1.0 )
diff --git a/debian/patches/series b/debian/patches/series
index 4fdcaf4..96533db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,5 @@ link-liblwgeom
use-debian-maven
honor-build-flags
fix-armel
-fix-big-endian
fix-manpage
joinsel-issue2543
-doc-resources
--
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