[SCM] postgis branch, master, updated. upstream/2.0.1-87-g7202c7e
Markus Wanner
markus at bluegap.ch
Tue Sep 10 20:00:51 UTC 2013
The following commit has been merged in the master branch:
commit f3a8f80f4f835c4b30fd807103100dab50a73234
Author: Markus Wanner <markus at bluegap.ch>
Date: Tue Sep 10 21:54:12 2013 +0200
Correct generation of debian/control: drop an unnecessary grep in
debian/pgversions. I broke it when changing to '9.0+'. Add a
comment to debian/pgversions explaining why '9.0+' is needed
rather than explicitly specifying all supported major versions.
Copy binaries for the common binary package 'postgis' from the
newest version via debian/rules rather than hard-coding 9.1 in
postgis.install.
Add experimental patch from upstream to increase pass rate on
non-Intel architectures (upstream-r11934).
Add a description and some tags to patch fix-manpage.
Drop patch fix-manpages from the git repo, it has already been
removed from the quilt patch series.
diff --git a/debian/changelog b/debian/changelog
index db73e94..1cf3c15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+postgis (2.1.0-2) UNRELEASED; urgency=low
+
+ * Correct generation of debian/control: drop an unnecessary grep in
+ debian/pgversions. I broke it when changing to '9.0+'.
+ * Copy binaries for the common binary package 'postgis' from the newest
+ version, rather than hardcoding 9.1.
+ * Add experimental patch from upstream to increase pass rate on
+ non-Intel architectures (upstream-r11934).
+ * Add a description and some tags to patch fix-manpage.
+
+ -- Markus Wanner <markus at bluegap.ch> Tue, 10 Sep 2013 21:53:57 +0200
+
postgis (2.1.0-1) unstable; urgency=low
* New upstream release
diff --git a/debian/control b/debian/control
index 60fcfcb..9537f89 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.1-postgis-2.1
+Suggests: postgresql-9.3-postgis-2.1
Description: Geographic objects support for PostgreSQL
PostGIS adds support for geographic objects to the PostgreSQL
object-relational database. In effect, PostGIS "spatially enables"
@@ -53,7 +53,7 @@ Package: libpostgis-java
Architecture: all
Section: java
Depends: libpostgresql-jdbc-java, ${misc:Depends}
-Suggests: postgresql-9.1-postgis-2.1
+Suggests: postgresql-9.3-postgis-2.1
Breaks: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java
Replaces: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java
Description: Geographic objects support for PostgreSQL -- JDBC support
@@ -101,14 +101,14 @@ Description: PostGIS "Lightweight Geometry" library - Development files
processing functions, are implemented here. This package contains
the development files.
-Package: postgresql-9.1-postgis-2.1
-Depends: ${shlibs:Depends}, postgresql-9.1,
- postgresql-9.1-postgis-2.1-scripts, liblwgeom-2.1.0,
+Package: postgresql-9.3-postgis-2.1
+Depends: ${shlibs:Depends}, postgresql-9.3,
+ postgresql-9.3-postgis-2.1-scripts, liblwgeom-2.1.0,
${misc:Depends}
Recommends: postgis
Breaks: postgis (<< 1.2.1)
Architecture: any
-Description: Geographic objects support for PostgreSQL 9.1
+Description: Geographic objects support for PostgreSQL 9.3
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
@@ -116,13 +116,13 @@ Description: Geographic objects support for PostgreSQL 9.1
SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
"Simple Features Specification for SQL".
.
- This package supports PostgreSQL 9.1.
+ This package supports PostgreSQL 9.3.
-Package: postgresql-9.1-postgis-2.1-scripts
+Package: postgresql-9.3-postgis-2.1-scripts
Architecture: all
Depends: ${misc:Depends}
-Recommends: postgresql-9.1-postgis-2.1
-Description: Geographic objects support for PostgreSQL 9.1 -- scripts
+Recommends: postgresql-9.3-postgis-2.1
+Description: Geographic objects support for PostgreSQL 9.3 -- 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
@@ -131,5 +131,5 @@ Description: Geographic objects support for PostgreSQL 9.1 -- scripts
"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.
+ versions for PostgreSQL 9.3 as well as Perl utility scripts.
diff --git a/debian/patches/fix-manpage b/debian/patches/fix-manpage
index bdb8aa5..24ef34e 100644
--- a/debian/patches/fix-manpage
+++ b/debian/patches/fix-manpage
@@ -1,3 +1,7 @@
+Description: Remove what looks like an UTF-8 marker or some such.
+Author: Markus Wanner <markus at bluegap.ch>
+Last-Update: 2013-09-09
+
--- a/loader/shp2pgsql-gui.1
+++ b/loader/shp2pgsql-gui.1
@@ -1,4 +1,4 @@
diff --git a/debian/patches/fix-manpages b/debian/patches/fix-manpages
deleted file mode 100644
index e895cd0..0000000
--- a/debian/patches/fix-manpages
+++ /dev/null
@@ -1,68 +0,0 @@
-Description: Properly escape dashes in man pages
-Author: Markus Wanner <markus at bluegap.ch>
-Last-Update: 2013-04-14
-Applied-Upstream: 2.1.0, http://trac.osgeo.org/postgis/changeset/11305/trunk
-
---- a/doc/man/shp2pgsql.1
-+++ b/doc/man/shp2pgsql.1
-@@ -28,7 +28,7 @@
- .LP
- The loader has several operating modes distinguished by command line flags:
-
--(Note that -a, -c, -d and -p are mutually exclusive.)
-+(Note that \-a, \-c, \-d and \-p are mutually exclusive.)
- .TP
- \fB\-d\fR
- Drops the database table before creating a new table with the data in the
-@@ -50,8 +50,8 @@
- .TP
- \fB\-D\fR
- Use the PostgreSQL "dump" format for the output data. This can be combined
--with -a, -c and -d. It is much faster to load than the default "insert" SQL
--format. Use this for very large data sets.
-+with \-a, \-c and \-d. It is much faster to load than the default "insert"
-+SQL format. Use this for very large data sets.
- .TP
- \fB\-w\fR
- Output WKT format, instead of WKB. Note that this can
-@@ -61,12 +61,12 @@
- Execute each statement on its own, without using a transaction.
- This allows loading of the majority of good data when there are some bad
- geometries that generate errors. Note that this cannot be used with the
---D flag as the "dump" format always uses a transaction.
-+\-D flag as the "dump" format always uses a transaction.
- .TP
- \fB\-s\fR [<\fIFROM_SRID\fR>:]<\fISRID\fR>
- Creates and populates the geometry tables with the specified SRID.
- If FROM_SRID is given, the geometries will be reprojected.
--Reprojection cannot be used with -D.
-+Reprojection cannot be used with \-D.
- .TP
- \fB\-G\fR
- Use the geography type instead of geometry. Geography is used to store
-@@ -102,12 +102,12 @@
- .TP
- \fB\-T\fR <\fItablespace\fR>
- Specify the tablespace for the new table. Indexes will still use the
--default tablespace unless the -X parameter is also used. The PostgreSQL
-+default tablespace unless the \-X parameter is also used. The PostgreSQL
- documentation has a good description on when to use custom tablespaces.
- .TP
- \fB\-X\fR <\fItablespace\fR>
- Specify the tablespace for the new table's indexes. This applies to
--the primary key index, and the GIST spatial index if -I is also used.
-+the primary key index, and the GIST spatial index if \-I is also used.
- .TP
- \fB\-?\fR
- Display version and usage information.
---- a/doc/man/pgsql2shp.1
-+++ b/doc/man/pgsql2shp.1
-@@ -93,7 +93,7 @@
- An example session using the dumper to create shape file from a database might
- look like this:
-
--# \fBpgsql2shp -f myfile -p 5555 my_db roads_table\fR
-+# \fBpgsql2shp \-f myfile \-p 5555 my_db roads_table\fR
-
- .SH "AUTHORS"
- .LP
diff --git a/debian/patches/series b/debian/patches/series
index 30534e1..fa254e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+upstream-r11934
debian-versions
java-version-fix
fixmakedoc
diff --git a/debian/patches/upstream-r11934 b/debian/patches/upstream-r11934
new file mode 100644
index 0000000..89b7d14
--- /dev/null
+++ b/debian/patches/upstream-r11934
@@ -0,0 +1,371 @@
+Description: pass big-endian online regression tests
+ An attempt to fix upstream ticket #2396 and considered experimental
+ for Debian.
+Origin: http://trac.osgeo.org/postgis/changeset/11934
+Author: Paul Ramsey <pramsey at opengeo.org>
+Last-Update: 2013-09-06
+
+--- a/regress/sql-mm-curvepoly.sql
++++ b/regress/sql-mm-curvepoly.sql
+@@ -317,12 +317,12 @@
+ SELECT DropGeometryColumn('public', 'curvepolygon', 'the_geom_4d');
+ DROP TABLE public.curvepolygon;
+
+-SELECT 'valid wkt curve polygon 1', ST_GeomFromEWKT('CURVEPOLYGON((143.62025166838282 -30.037497356076827, 142.92857147299705 -32.75101196874403, 145.96132309891922 -34.985671061528784, 149.57565307617188 -33.41153335571289, 149.41972407584802 -29.824672680573517, 146.1209416055467 -30.19711586270431, 143.62025166838282 -30.037497356076827))');
+-SELECT 'valid wkt curve polygon 2', ST_GeomFromEWKT('CURVEPOLYGON((143.62025166838282 -30.037497356076827, 142.92857147299705 -32.75101196874403, 145.96132309891922 -34.985671061528784, 149.57565307617188 -33.41153335571289, 149.41972407584802 -29.824672680573517, 146.1209416055467 -30.19711586270431, 143.62025166838282 -30.037497356076827),(144.84399355252685 -31.26123924022086, 144.20551952601693 -32.27215644886158, 145.55230712890625 -33.49203872680664, 147.97080993652344 -32.03618621826172, 146.38697244992585 -31.47406391572417, 144.84399355252685 -31.26123924022086))');
+-SELECT 'valid wkt curve polygon 3', ST_GeomFromEWKT('CURVEPOLYGON(CIRCULARSTRING(143.62025166838282 -30.037497356076827, 142.92857147299705 -32.75101196874403, 145.96132309891922 -34.985671061528784, 149.57565307617188 -33.41153335571289, 149.41972407584802 -29.824672680573517, 146.1209416055467 -30.19711586270431, 143.62025166838282 -30.037497356076827))');
++SELECT 'valid wkt curve polygon 1', ST_AsBinary(ST_GeomFromEWKT('CURVEPOLYGON((143.62025166838282 -30.037497356076827, 142.92857147299705 -32.75101196874403, 145.96132309891922 -34.985671061528784, 149.57565307617188 -33.41153335571289, 149.41972407584802 -29.824672680573517, 146.1209416055467 -30.19711586270431, 143.62025166838282 -30.037497356076827))'),'ndr');
++SELECT 'valid wkt curve polygon 2', ST_AsBinary(ST_GeomFromEWKT('CURVEPOLYGON((143.62025166838282 -30.037497356076827, 142.92857147299705 -32.75101196874403, 145.96132309891922 -34.985671061528784, 149.57565307617188 -33.41153335571289, 149.41972407584802 -29.824672680573517, 146.1209416055467 -30.19711586270431, 143.62025166838282 -30.037497356076827),(144.84399355252685 -31.26123924022086, 144.20551952601693 -32.27215644886158, 145.55230712890625 -33.49203872680664, 147.97080993652344 -32.03618621826172, 146.38697244992585 -31.47406391572417, 144.84399355252685 -31.26123924022086))'),'ndr');
++SELECT 'valid wkt curve polygon 3', ST_AsBinary(ST_GeomFromEWKT('CURVEPOLYGON(CIRCULARSTRING(143.62025166838282 -30.037497356076827, 142.92857147299705 -32.75101196874403, 145.96132309891922 -34.985671061528784, 149.57565307617188 -33.41153335571289, 149.41972407584802 -29.824672680573517, 146.1209416055467 -30.19711586270431, 143.62025166838282 -30.037497356076827))'),'ndr');
+ SELECT 'valid wkt curve polygon 4',
+- ST_GeomFromEWKT('CURVEPOLYGON(CIRCULARSTRING(143.62025166838282 -30.037497356076827, 142.92857147299705 -32.75101196874403, 145.96132309891922 -34.985671061528784, 149.57565307617188 -33.41153335571289, 149.41972407584802 -29.824672680573517, 146.1209416055467 -30.19711586270431, 143.62025166838282 -30.037497356076827),(144.84399355252685 -31.26123924022086, 144.20551952601693 -32.27215644886158, 145.55230712890625 -33.49203872680664, 147.97080993652344 -32.03618621826172, 146.38697244992585 -31.47406391572417, 144.84399355252685 -31.26123924022086))');
+-SELECT 'valid wkt curve polygon 5', ST_GeomFromEWKT('CURVEPOLYGON((143.62025166838282 -30.037497356076827, 142.92857147299705 -32.75101196874403, 145.96132309891922 -34.985671061528784, 149.57565307617188 -33.41153335571289, 149.41972407584802 -29.824672680573517, 146.1209416055467 -30.19711586270431, 143.62025166838282 -30.037497356076827),COMPOUNDCURVE(CIRCULARSTRING(144.84399355252685 -31.26123924022086, 144.20551952601693 -32.27215644886158, 145.55230712890625 -33.49203872680664), (145.55230712890625 -33.49203872680664, 147.97080993652344 -32.03618621826172),CIRCULARSTRING(147.97080993652344 -32.03618621826172, 146.38697244992585 -31.47406391572417, 144.84399355252685 -31.26123924022086)))');
++ ST_AsBinary(ST_GeomFromEWKT('CURVEPOLYGON(CIRCULARSTRING(143.62025166838282 -30.037497356076827, 142.92857147299705 -32.75101196874403, 145.96132309891922 -34.985671061528784, 149.57565307617188 -33.41153335571289, 149.41972407584802 -29.824672680573517, 146.1209416055467 -30.19711586270431, 143.62025166838282 -30.037497356076827),(144.84399355252685 -31.26123924022086, 144.20551952601693 -32.27215644886158, 145.55230712890625 -33.49203872680664, 147.97080993652344 -32.03618621826172, 146.38697244992585 -31.47406391572417, 144.84399355252685 -31.26123924022086))'),'ndr');
++SELECT 'valid wkt curve polygon 5', ST_AsBinary(ST_GeomFromEWKT('CURVEPOLYGON((143.62025166838282 -30.037497356076827, 142.92857147299705 -32.75101196874403, 145.96132309891922 -34.985671061528784, 149.57565307617188 -33.41153335571289, 149.41972407584802 -29.824672680573517, 146.1209416055467 -30.19711586270431, 143.62025166838282 -30.037497356076827),COMPOUNDCURVE(CIRCULARSTRING(144.84399355252685 -31.26123924022086, 144.20551952601693 -32.27215644886158, 145.55230712890625 -33.49203872680664), (145.55230712890625 -33.49203872680664, 147.97080993652344 -32.03618621826172),CIRCULARSTRING(147.97080993652344 -32.03618621826172, 146.38697244992585 -31.47406391572417, 144.84399355252685 -31.26123924022086)))'),'ndr');
+ SELECT 'invalid wkt curve polygon 4', ST_GeomFromEWKT('CURVEPOLYGON((143.62025166838282 -30.037497356076827, 142.92857147299705 -32.75101196874403, 145.96132309891922 -34.985671061528784, 149.57565307617188 -33.41153335571289, 149.41972407584802 -29.824672680573517, 146.1209416055467 -30.19711586270431, 143.62025166838282 -30.037497356076))');
+ SELECT 'invalid wkt curve polygon 5', ST_GeomFromEWKT('CURVEPOLYGON((143.62025166838282 -30.037497356076827, 142.92857147299705 -32.75101196874403, 145.96132309891922 -34.985671061528784, 149.57565307617188 -33.41153335571289, 149.41972407584802 -29.824672680573517, 146.1209416055467 -30.19711586270431, 143.62025166838282 -30.037497356076827),(144.84399355252685 -31.26123924022086, 144.20551952601693 -32.27215644886158, 145.55230712890625 -33.49203872680664, 147.97080993652344 -32.03618621826172, 146.38697244992585 -31.47406391572417))');
+ SELECT 'invalid wkt curve polygon 6', ST_GeomFromEWKT('CURVEPOLYGON((143.62025166838282 -30.037497356076827, 142.92857147299705 -32.75101196874403, 145.96132309891922 -34.985671061528784, 149.57565307617188 -33.41153335571289, 149.41972407584802 -29.824672680573517, 146.1209416055467 -30.19711586270431),(144.84399355252685 -31.26123924022086, 144.20551952601693 -32.27215644886158, 145.55230712890625 -33.49203872680664, 147.97080993652344 -32.03618621826172, 146.38697244992585 -31.47406391572417, 144.84399355252685 -31.26123924022086))');
+--- a/regress/tickets.sql
++++ b/regress/tickets.sql
+@@ -99,7 +99,7 @@
+ SELECT '#124b', ST_AsText(ST_GeomFromEWKT('COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1,1 0),(1 0,30 6),CIRCULARSTRING(30 5,34 56,67 89))'));
+
+ -- #145 --
+-SELECT '#145a', ST_Buffer(ST_GeomFromText('LINESTRING(-116.93414544665981 34.16033385105459,-116.87777514700957 34.10831080544884,-116.86972224705954 34.086748622072776,-116.9327074288116 34.08458099517253,-117.00216369088065 34.130329331330216,-117.00216369088065 34.130329331330216)', 4326), 0);
++SELECT '#145a', ST_AsEWKB(ST_Buffer(ST_GeomFromText('LINESTRING(-116.93414544665981 34.16033385105459,-116.87777514700957 34.10831080544884,-116.86972224705954 34.086748622072776,-116.9327074288116 34.08458099517253,-117.00216369088065 34.130329331330216,-117.00216369088065 34.130329331330216)', 4326), 0),'ndr');
+ SELECT '#145b', ST_Area(ST_Buffer(ST_GeomFromText('LINESTRING(-116.93414544665981 34.16033385105459,-116.87777514700957 34.10831080544884,-116.86972224705954 34.086748622072776,-116.9327074288116 34.08458099517253,-117.00216369088065 34.130329331330216,-117.00216369088065 34.130329331330216)', 4326), 0));
+
+ -- #146 --
+@@ -163,7 +163,7 @@
+ DROP TABLE c;
+
+ -- #254 --
+-SELECT '#254', ST_Segmentize(ST_GeomFromText('GEOMETRYCOLLECTION EMPTY'), 0.5);
++SELECT '#254', ST_AsEWKB(ST_Segmentize(ST_GeomFromText('GEOMETRYCOLLECTION EMPTY'), 0.5),'ndr');
+
+ -- #259 --
+ SELECT '#259', ST_Distance(ST_GeographyFromText('SRID=4326;POLYGON EMPTY'), ST_GeographyFromText('SRID=4326;POINT(1 2)'));
+@@ -328,7 +328,7 @@
+ SELECT '#677',round(ST_Distance_Spheroid(ST_GeomFromEWKT('MULTIPOLYGON(((-10 40,-10 55,-10 70,5 40,-10 40)))'), ST_GeomFromEWKT('MULTIPOINT(20 40,20 55,20 70,35 40,35 55,35 70,50 40,50 55,50 70)'), 'SPHEROID["GRS_1980",6378137,298.257222101]')) As result;
+
+ -- #680 --
+-SELECT '#680', encode(ST_AsBinary(geography(foo1.the_geom)),'hex') As result FROM ((SELECT ST_SetSRID(ST_MakePointM(i,j,m),4326) As the_geom FROM generate_series(-10,50,10) As i CROSS JOIN generate_series(50,70, 20) AS j CROSS JOIN generate_series(1,2) As m ORDER BY i, j, i*j*m)) As foo1 LIMIT 1;
++SELECT '#680', encode(ST_AsBinary(geography(foo1.the_geom),'ndr'),'hex') As result FROM ((SELECT ST_SetSRID(ST_MakePointM(i,j,m),4326) As the_geom FROM generate_series(-10,50,10) As i CROSS JOIN generate_series(50,70, 20) AS j CROSS JOIN generate_series(1,2) As m ORDER BY i, j, i*j*m)) As foo1 LIMIT 1;
+
+ -- #681 --
+ SELECT '#681a', ST_AsGML(ST_GeomFromText('POINT EMPTY', 4326));
+@@ -341,10 +341,10 @@
+
+
+ -- #682 --
+-SELECT '#682', ST_Buffer(ST_GeomFromText('POLYGON EMPTY',4326) , 0.5);
++SELECT '#682', ST_AsEWKB(ST_Buffer(ST_GeomFromText('POLYGON EMPTY',4326) , 0.5), 'ndr');
+
+ -- #683 --
+-SELECT '#683', ST_BuildArea(ST_GeomFromText('POINT EMPTY',4326));
++SELECT '#683', ST_AsEWKB(ST_BuildArea(ST_GeomFromText('POINT EMPTY',4326)),'ndr');
+
+ -- #684,#2109 --
+ SELECT '#684,#2109', ST_AsEWKT(ST_Centroid(ST_GeomFromText('POLYGON EMPTY',4326)));
+@@ -367,8 +367,8 @@
+ SELECT ST_MakeLine(ST_GeomFromText('POINT(-11.1111111 40)'), ST_GeomFromText('LINESTRING(-11.1111111 70,70 -11.1111111)')) As result;
+
+ -- #693 --
+-SELECT '#693a', ST_GeomFromEWKT('SRID=4326;POLYGONM((-71.1319 42.2503 1,-71.132 42.2502 3,-71.1323 42.2504 -2,-71.1322 42.2505 1,-71.1319 42.2503 0))');
+-SELECT '#693b', ST_GeomFromEWKT('SRID=4326;POLYGONM((-71.1319 42.2512 0,-71.1318 42.2511 20,-71.1317 42.2511 -20,-71.1317 42.251 5,-71.1317 42.2509 4,-71.132 42.2511 6,-71.1319 42.2512 30))');
++SELECT '#693a', ST_AsEWKB(ST_GeomFromEWKT('SRID=4326;POLYGONM((-71.1319 42.2503 1,-71.132 42.2502 3,-71.1323 42.2504 -2,-71.1322 42.2505 1,-71.1319 42.2503 0))'),'ndr');
++SELECT '#693b', ST_AsEWKB(ST_GeomFromEWKT('SRID=4326;POLYGONM((-71.1319 42.2512 0,-71.1318 42.2511 20,-71.1317 42.2511 -20,-71.1317 42.251 5,-71.1317 42.2509 4,-71.132 42.2511 6,-71.1319 42.2512 30))'),'ndr');
+
+ -- #694 --
+ SELECT '#694';
+@@ -379,14 +379,14 @@
+ SELECT ST_RemovePoint('POINT(-11.1111111 40)'::geometry, 1);
+
+ -- #696 --
+-SELECT '#696',ST_Segmentize(ST_GeomFromEWKT('PolyhedralSurface( ((0 0 0, 0 0 1, 0 1 1, 0 1 0, 0 0 0)), ((0 0 0, 0 1 0, 1 1 0, 1 0 0, 0 0 0)), ((0 0 0, 1 0 0, 1 0 1, 0 0 1, 0 0 0)), ((1 1 0, 1 1 1, 1 0 1, 1 0 0, 1 1 0)), ((0 1 0, 0 1 1, 1 1 1, 1 1 0, 0 1 0)), ((0 0 1, 1 0 1, 1 1 1, 0 1 1, 0 0 1)) )'), 0.5);
++SELECT '#696', ST_AsEWKB(ST_Segmentize(ST_GeomFromEWKT('PolyhedralSurface( ((0 0 0, 0 0 1, 0 1 1, 0 1 0, 0 0 0)), ((0 0 0, 0 1 0, 1 1 0, 1 0 0, 0 0 0)), ((0 0 0, 1 0 0, 1 0 1, 0 0 1, 0 0 0)), ((1 1 0, 1 1 1, 1 0 1, 1 0 0, 1 1 0)), ((0 1 0, 0 1 1, 1 1 1, 1 1 0, 0 1 0)), ((0 0 1, 1 0 1, 1 1 1, 0 1 1, 0 0 1)) )'), 0.5),'ndr');
+
+ -- #720 --
+ SELECT '#720', ST_AsText(ST_SnapTogrid(ST_Transform(ST_GeomFromText('MULTIPOINT(-10 40,-10 55,-10 70,5 40,5 55,5 70,20 40,20 55,20 70,35 40,35 55,35 70,50 40,50 55,50 70)',4326), 3395), 0.01));
+
+ -- #723 --
+ SELECT '#723',
+- ST_SnapToGrid( ST_Intersection(a.geog, b.geog)::geometry, 0.00001)
++ ST_AsEWKB(ST_SnapToGrid( ST_Intersection(a.geog, b.geog)::geometry, 0.00001),'ndr')
+ FROM (VALUES (ST_GeogFromText('SRID=4326;POINT(-11.1111111 40)') ), (ST_GeogFromText('SRID=4326;POINT(-11.1111111 55)') ) ) As a(geog) CROSS JOIN ( VALUES (ST_GeogFromText('SRID=4326;POINT(-11.1111111 40)') ), (ST_GeogFromText('SRID=4326;POINT(-11.1111111 55)') )) As b(geog);
+
+ -- #729 --
+@@ -556,7 +556,7 @@
+ SELECT '#1414', st_astext(st_Force3DZ('CURVEPOLYGON EMPTY'));
+
+ -- #1478
+-SELECT '#1478', 'SRID=1;POINT EMPTY'::geometry::text::geometry;
++SELECT '#1478', ST_AsEWKB('SRID=1;POINT EMPTY'::geometry::text::geometry,'ndr');
+
+ -- #745
+ SELECT '#745', ST_AsEWKT(ST_Split('POLYGON((-72 42 1,-70 43 1,-71 41 1,-72 42 1))',
+@@ -683,7 +683,7 @@
+ DROP table eg;
+
+ -- #1755 --
+-select '#1755', st_geographyFromText('SRID=4326;Point(85 35 0)');
++select '#1755', ST_AsBinary(ST_GeographyFromText('SRID=4326;Point(85 35 0)'),'ndr');
+
+ -- #1776 --
+ with inp as ( SELECT
+--- a/regress/tickets_expected
++++ b/regress/tickets_expected
+@@ -23,7 +23,7 @@
+ #122|CIRCULARSTRING(220268 150415,220227 150505,220227 150406)
+ #124a|COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1,1 0),(1 0,30 5),CIRCULARSTRING(30 5,34 56,67 89))
+ ERROR: incontinuous compound curve
+-#145a|0103000020E610000000000000
++#145a|\x0103000020e610000000000000
+ #145b|0
+ #146|0|t|GEOMETRYCOLLECTION(LINESTRING(0 0,-1 -1),MULTIPOINT(1 2,2 3))
+ ERROR: Invalid hex string, length (267) has to be a multiple of two!
+@@ -47,7 +47,7 @@
+ #213|17
+ #234|COMPOUNDCURVE((0 0,1 1))
+ #241|0
+-#254|010700000000000000
++#254|\x010700000000000000
+ #259|
+ #260|1667701
+ #261|0
+@@ -105,8 +105,8 @@
+ #681e|
+ #681f|
+ #681g|
+-#682|0103000020E610000000000000
+-#683|0103000020E610000000000000
++#682|\x0103000020e610000000000000
++#683|\x0103000020e610000000000000
+ #684,#2109|SRID=4326;POINT EMPTY
+ #2109|SRID=3395;POINT EMPTY
+ #685|0103000020E610000000000000
+@@ -115,18 +115,18 @@
+ #689|f
+ #690
+ 010200000003000000F771D98DE33826C00000000000004440F771D98DE33826C000000000008051400000000000805140F771D98DE33826C0
+-#693a|0103000060E61000000100000005000000EA95B20C71C851C02B1895D409204540000000000000F03F9CC420B072C851C0C7BAB88D062045400000000000000840B1506B9A77C851C08E75711B0D20454000000000000000C0FF21FDF675C851C0F2D24D6210204540000000000000F03FEA95B20C71C851C02B1895D4092045400000000000000000
+-#693b|0103000060E61000000100000007000000EA95B20C71C851C0AA605452272045400000000000000000386744696FC851C04703780B2420454000000000000034408638D6C56DC851C04703780B2420454000000000000034C08638D6C56DC851C0E3A59BC42020454000000000000014408638D6C56DC851C08048BF7D1D20454000000000000010409CC420B072C851C04703780B242045400000000000001840EA95B20C71C851C0AA605452272045400000000000003E40
++#693a|\x0103000060e61000000100000005000000ea95b20c71c851c02b1895d409204540000000000000f03f9cc420b072c851c0c7bab88d062045400000000000000840b1506b9a77c851c08e75711b0d20454000000000000000c0ff21fdf675c851c0f2d24d6210204540000000000000f03fea95b20c71c851c02b1895d4092045400000000000000000
++#693b|\x0103000060e61000000100000007000000ea95b20c71c851c0aa605452272045400000000000000000386744696fc851c04703780b2420454000000000000034408638d6c56dc851c04703780b2420454000000000000034c08638d6c56dc851c0e3a59bc42020454000000000000014408638d6c56dc851c08048bf7d1d20454000000000000010409cc420b072c851c04703780b242045400000000000001840ea95b20c71c851c0aa605452272045400000000000003e40
+ #694
+ ERROR: Shell is not a line
+ #695
+ ERROR: First argument must be a LINESTRING
+-#696|010F000080060000000103000080010000000500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000F03F0000000000000000000000000000F03F000000000000F03F0000000000000000000000000000F03F0000000000000000000000000000000000000000000000000000000000000000010300008001000000050000000000000000000000000000000000000000000000000000000000000000000000000000000000F03F0000000000000000000000000000F03F000000000000F03F0000000000000000000000000000F03F0000000000000000000000000000000000000000000000000000000000000000000000000000000001030000800100000005000000000000000000000000000000000000000000000000000000000000000000F03F00000000000000000000000000000000000000000000F03F0000000000000000000000000000F03F00000000000000000000000000000000000000000000F03F00000000000000000000000000000000000000000000000001030000800100000005000000000000000000F03F000000000000F03F0000000000000000000000000000F03F000000000000F03F000000000000F03F000000000000F03F0000000000000000000000000000F03F000000000000F03F00000000000000000000000000000000000000000000F03F000000000000F03F0000000000000000010300008001000000050000000000000000000000000000000000F03F00000000000000000000000000000000000000000000F03F000000000000F03F000000000000F03F000000000000F03F000000000000F03F000000000000F03F000000000000F03F00000000000000000000000000000000000000000000F03F00000000000000000103000080010000000500000000000000000000000000000000000000000000000000F03F000000000000F03F0000000000000000000000000000F03F000000000000F03F000000000000F03F000000000000F03F0000000000000000000000000000F03F000000000000F03F00000000000000000000000000000000000000000000F03F
++#696|\x010f000080060000000103000080010000000500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f03f0000000000000000000000000000f03f000000000000f03f0000000000000000000000000000f03f0000000000000000000000000000000000000000000000000000000000000000010300008001000000050000000000000000000000000000000000000000000000000000000000000000000000000000000000f03f0000000000000000000000000000f03f000000000000f03f0000000000000000000000000000f03f0000000000000000000000000000000000000000000000000000000000000000000000000000000001030000800100000005000000000000000000000000000000000000000000000000000000000000000000f03f00000000000000000000000000000000000000000000f03f0000000000000000000000000000f03f00000000000000000000000000000000000000000000f03f00000000000000000000000000000000000000000000000001030000800100000005000000000000000000f03f000000000000f03f0000000000000000000000000000f03f000000000000f03f000000000000f03f000000000000f03f0000000000000000000000000000f03f000000000000f03f00000000000000000000000000000000000000000000f03f000000000000f03f0000000000000000010300008001000000050000000000000000000000000000000000f03f00000000000000000000000000000000000000000000f03f000000000000f03f000000000000f03f000000000000f03f000000000000f03f000000000000f03f000000000000f03f00000000000000000000000000000000000000000000f03f00000000000000000103000080010000000500000000000000000000000000000000000000000000000000f03f000000000000f03f0000000000000000000000000000f03f000000000000f03f000000000000f03f000000000000f03f0000000000000000000000000000f03f000000000000f03f00000000000000000000000000000000000000000000f03f
+ #720|MULTIPOINT(-1113194.91 4838471.4,-1113194.91 7326837.72,-1113194.91 11028513.63,556597.45 4838471.4,556597.45 7326837.72,556597.45 11028513.63,2226389.82 4838471.4,2226389.82 7326837.72,2226389.82 11028513.63,3896182.18 4838471.4,3896182.18 7326837.72,3896182.18 11028513.63,5565974.54 4838471.4,5565974.54 7326837.72,5565974.54 11028513.63)
+-#723|0101000020E61000006284F068E33826C00000000000004440
+-#723|0107000020E610000000000000
+-#723|0107000020E610000000000000
+-#723|0101000020E61000006284F068E33826C00100000000804B40
++#723|\x0101000020e61000006284f068e33826c00000000000004440
++#723|\x0107000020e610000000000000
++#723|\x0107000020e610000000000000
++#723|\x0101000020e61000006284f068e33826c00100000000804b40
+ #804|<gml:Point srsName="urn:ogc:def:crs:EPSG::4326"><gml:pos srsDimension="2">0 0</gml:pos></gml:Point>
+ #845|t
+ #834|GEOMETRYCOLLECTION(POINT(0 0 5),LINESTRING(10 10 5,10 0 5))
+@@ -184,7 +184,7 @@
+ #1453.2|f
+ #1454|t
+ #1414|CURVEPOLYGON Z EMPTY
+-#1478|01040000200100000000000000
++#1478|\x01040000200100000000000000
+ #745|GEOMETRYCOLLECTION(POLYGON((-72 42 1,-70 43 1,-71 41 1,-72 42 1)))
+ #1450|POINT|POLYGON
+ #1482|4326
+@@ -219,7 +219,7 @@
+ #1697.2|0
+ #1697.3|1024
+ #1734.1|1026
+-#1755|01010000A0E6100000000000000040554000000000008041400000000000000000
++#1755|\x01e9030000000000000040554000000000008041400000000000000000
+ #1776|POLYGON((0 0,10 0,10 10,0 0))|POLYGON((0 0,10 0,10 10,0 0))
+ #1780|t
+ #1791|4.7
+--- a/regress/regress_expected
++++ b/regress/regress_expected
+@@ -154,7 +154,7 @@
+ 148|LINESTRING(0 0,5 0,10 0)
+ 149|GEOMETRYCOLLECTION EMPTY
+ 150|SRID=6;GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)))
+-151|0103000020E61000000100000005000000000000000000000000000000000000000000000000000000000000000000F03F000000000000F03F000000000000F03F000000000000F03F000000000000000000000000000000000000000000000000
++151|\x01030000000100000005000000000000000000000000000000000000000000000000000000000000000000f03f000000000000f03f000000000000f03f000000000000f03f000000000000000000000000000000000000000000000000
+ 152|4326
+ 152.1|t
+ 152.2|4326
+@@ -167,7 +167,7 @@
+ 159|MULTIPOLYGON EMPTY
+ 160|MULTIPOINT(1 1)
+ 161|MULTILINESTRING((0 0,1 1),(2 2,3 3))
+-162|010200000003000000F771D98DE33826C00000000000004440F771D98DE33826C000000000008051400000000000805140F771D98DE33826C0
++162|\x010200000003000000f771d98de33826c00000000000004440f771d98de33826c000000000008051400000000000805140f771d98de33826c0
+ 163|POLYGON((0 0 0,1 0 0,1 1 0,0 1 0,0 0 0))
+ 164|POLYGON((0 0 0,1 0 0,1 1 0,0 1 0,0 0 1))
+ ERROR: geometry contains non-closed rings
+--- a/regress/sql-mm-compoundcurve.sql
++++ b/regress/sql-mm-compoundcurve.sql
+@@ -303,11 +303,11 @@
+ SELECT DropGeometryColumn('public', 'compoundcurve', 'the_geom_2d');
+ DROP TABLE public.compoundcurve;
+
+-SELECT 'valid wkt compound curve 1', ST_GeomFromEWKT('COMPOUNDCURVE((153.72942375 -27.21757040, 152.29285719 -29.23940482, 154.74034096 -30.51635287),(154.74034096 -30.51635287, 152.39926953 -32.16574411, 155.11278414 -34.08116619, 151.86720784 -35.62414508))');
+-SELECT 'valid wkt compound curve 2', ST_GeomFromEWKT('COMPOUNDCURVE((153.72942375 -27.21757040, 152.29285719 -29.23940482, 154.74034096 -30.51635287, 152.39926953 -32.16574411, 155.11278414 -34.08116619, 151.86720784 -35.62414508))');
+-SELECT 'valid wkt compound curve 3', ST_GeomFromEWKT('COMPOUNDCURVE((151.60117699 -27.32398274, 151.22873381 -35.94338210, 150.74987829 -27.80283826))');
+-SELECT 'valid wkt compound curve 4', ST_GeomFromEWKT('COMPOUNDCURVE((153.72942375 -27.21757040, 152.29285719 -29.23940482, 154.74034096 -30.51635287),CIRCULARSTRING(154.74034096 -30.51635287, 154.74034096 -30.51635287, 152.39926953 -32.16574411, 155.11278414 -34.08116619, 151.86720784 -35.62414508))');
+-SELECT 'valid wkt compound curve 5', ST_GeomFromEWKT('COMPOUNDCURVE(CIRCULARSTRING(157.87950492 -27.59001358, 156.01728901 -28.28169378, 155.59163966 -26.52589021),(155.59163966 -26.52589021, 153.72942375 -27.21757040, 152.29285719 -29.23940482, 154.74034096 -30.51635287),CIRCULARSTRING(154.74034096 -30.51635287, 154.74034096 -30.51635287, 152.39926953 -32.16574411, 155.11278414 -34.08116619, 151.86720784 -35.62414508))');
++SELECT 'valid wkt compound curve 1', ST_AsBinary(ST_GeomFromEWKT('COMPOUNDCURVE((153.72942375 -27.21757040, 152.29285719 -29.23940482, 154.74034096 -30.51635287),(154.74034096 -30.51635287, 152.39926953 -32.16574411, 155.11278414 -34.08116619, 151.86720784 -35.62414508))'),'ndr');
++SELECT 'valid wkt compound curve 2', ST_AsBinary(ST_GeomFromEWKT('COMPOUNDCURVE((153.72942375 -27.21757040, 152.29285719 -29.23940482, 154.74034096 -30.51635287, 152.39926953 -32.16574411, 155.11278414 -34.08116619, 151.86720784 -35.62414508))'),'ndr');
++SELECT 'valid wkt compound curve 3', ST_AsBinary(ST_GeomFromEWKT('COMPOUNDCURVE((151.60117699 -27.32398274, 151.22873381 -35.94338210, 150.74987829 -27.80283826))'),'ndr');
++SELECT 'valid wkt compound curve 4', ST_AsBinary(ST_GeomFromEWKT('COMPOUNDCURVE((153.72942375 -27.21757040, 152.29285719 -29.23940482, 154.74034096 -30.51635287),CIRCULARSTRING(154.74034096 -30.51635287, 154.74034096 -30.51635287, 152.39926953 -32.16574411, 155.11278414 -34.08116619, 151.86720784 -35.62414508))'),'ndr');
++SELECT 'valid wkt compound curve 5', ST_AsBinary(ST_GeomFromEWKT('COMPOUNDCURVE(CIRCULARSTRING(157.87950492 -27.59001358, 156.01728901 -28.28169378, 155.59163966 -26.52589021),(155.59163966 -26.52589021, 153.72942375 -27.21757040, 152.29285719 -29.23940482, 154.74034096 -30.51635287),CIRCULARSTRING(154.74034096 -30.51635287, 154.74034096 -30.51635287, 152.39926953 -32.16574411, 155.11278414 -34.08116619, 151.86720784 -35.62414508))'),'ndr');
+ SELECT 'invalid wkt compound curve 1', ST_GeomFromEWKT('COMPOUNDCURVE((153.72942375 -27.21757040, 152.29285719 -29.23940482, 154.74034096 -30.51635287),(152.39926953 -32.16574411, 155.11278414 -34.08116619, 151.86720784 -35.62414508))');
+ SELECT 'invalid wkt compound curve 2', ST_GeomFromEWKT('COMPOUNDCURVE((153.72942375 -27.21757040, 152.29285719 -29.23940482),CIRCULARSTRING(154.74034096 -30.51635287, 154.74034096 -30.51635287, 152.39926953 -32.16574411, 155.11278414 -34.08116619, 151.86720784 -35.62414508))');
+ SELECT 'invalid wkt compound curve 3', ST_GeomFromEWKT('COMPOUNDCURVE(CIRCULARSTRING(157.87950492 -27.59001358, 156.01728901 -28.28169378, 155.59163966 -26.52589021, 153.72942375 -27.21757040),(153.72942375 -27.21757040, 152.29285719 -29.23940482),CIRCULARSTRING(154.74034096 -30.51635287, 154.74034096 -30.51635287, 152.39926953 -32.16574411, 155.11278414 -34.08116619, 151.86720784 -35.62414508))');
+@@ -317,8 +317,8 @@
+ SELECT 'valid wkb compound curve 4', ST_asEWKT(ST_GeomFromEWKB(decode('0109000000020000000102000000030000009FE5797057376340E09398B1B2373BC05AAE0A165F0963409F6760A2493D3DC0DB6286DFB057634082D8A1B32F843EC0010800000005000000DB6286DFB057634082D8A1B32F843EC0DB6286DFB057634082D8A1B32F843EC075B4E4D0C60C634031FA5D1A371540C0D7197CED9B636340A3CB59A7630A41C050F4A72AC0FB6240974769FCE3CF41C0', 'hex')));
+ SELECT 'valid wkb compound curve 5', ST_asEWKT(ST_GeomFromEWKB(decode('010900000003000000010800000003000000468280E724BC6340BF4B46210B973BC0F890AEA18D8063402D9664151D483CC0EED64BB6EE726340903CA5BDA0863AC0010200000004000000EED64BB6EE726340903CA5BDA0863AC09FE5797057376340E09398B1B2373BC05AAE0A165F0963409F6760A2493D3DC0DB6286DFB057634082D8A1B32F843EC0010800000005000000DB6286DFB057634082D8A1B32F843EC0DB6286DFB057634082D8A1B32F843EC075B4E4D0C60C634031FA5D1A371540C0D7197CED9B636340A3CB59A7630A41C050F4A72AC0FB6240974769FCE3CF41C0', 'hex')));
+ SELECT 'null response', ST_NumPoints(ST_GeomFromEWKT('COMPOUNDCURVE(CIRCULARSTRING(0 0,2 0, 2 1, 2 3, 4 3),(4 3, 4 5, 1 4, 0 0))'));
+-SELECT 'minpoints issues - pass', ST_GeomFromText('COMPOUNDCURVE((0 0,1 1))');
+-SELECT 'minpoints issues - pass', ST_GeomFromText('COMPOUNDCURVE(CIRCULARSTRING(0 0,0 1,1 1))');
++SELECT 'minpoints issues - pass', ST_AsBinary(ST_GeomFromText('COMPOUNDCURVE((0 0,1 1))'),'ndr');
++SELECT 'minpoints issues - pass', ST_AsBinary(ST_GeomFromText('COMPOUNDCURVE(CIRCULARSTRING(0 0,0 1,1 1))'),'ndr');
+ SELECT 'minpoints issues - fail', ST_GeomFromText('COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1))');
+ SELECT 'minpoints issues - fail', ST_GeomFromText('COMPOUNDCURVE(CIRCULARSTRING(0 0))');
+ SELECT 'minpoints issues - fail', ST_GeomFromText('COMPOUNDCURVE((0 0),(0 0,1 1))');
+--- a/regress/empty.sql
++++ b/regress/empty.sql
+@@ -36,29 +36,29 @@
+ 'POLYGON EMPTY'::geometry as empty,
+ 'POLYGON((0 0, 10 0, 5 5, 0 0))'::geometry as geometry,
+ 120 as tolerance
+- ) SELECT 'ST_Buffer(empty, tolerance) == empty', ST_Buffer(empty, tolerance) FROM inp;
++ ) SELECT 'ST_Buffer(empty, tolerance) == empty', ST_AsBinary(ST_Buffer(empty, tolerance),'ndr') FROM inp;
+ WITH inp AS (SELECT
+ 'POLYGON EMPTY'::geometry as empty,
+ 'POLYGON((0 0, 10 0, 5 5, 0 0))'::geometry as geometry
+- ) SELECT 'ST_Union(geometry, empty) == geometry', ST_Union(geometry, empty) FROM inp;
++ ) SELECT 'ST_Union(geometry, empty) == geometry', ST_AsBinary(ST_Union(geometry, empty),'ndr') FROM inp;
+ WITH inp AS (SELECT
+ 'POLYGON EMPTY'::geometry as empty
+- ) SELECT 'ST_Union(empty, empty) == empty', ST_Union(empty, empty) FROM inp;
++ ) SELECT 'ST_Union(empty, empty) == empty', ST_AsBinary(ST_Union(empty, empty),'ndr') FROM inp;
+ WITH inp AS (SELECT
+ 'POLYGON EMPTY'::geometry as empty,
+ 'POLYGON((0 0, 10 0, 5 5, 0 0))'::geometry as geometry
+- ) SELECT 'ST_Intersection(geometry, empty) == geometry', ST_Intersection(geometry, empty) FROM inp;
++ ) SELECT 'ST_Intersection(geometry, empty) == geometry', ST_AsBinary(ST_Intersection(geometry, empty),'ndr') FROM inp;
+ WITH inp AS (SELECT
+ 'POLYGON EMPTY'::geometry as empty
+- ) SELECT 'ST_Intersection(empty, empty) == empty', ST_Intersection(empty, empty) FROM inp;
++ ) SELECT 'ST_Intersection(empty, empty) == empty', ST_AsBinary(ST_Intersection(empty, empty),'ndr') FROM inp;
+ WITH inp AS (SELECT
+ 'POLYGON EMPTY'::geometry as empty,
+ 'POLYGON((0 0, 10 0, 5 5, 0 0))'::geometry as geometry
+- ) SELECT 'ST_Difference(geometry, empty) == geometry', ST_Difference(geometry, empty) FROM inp;
++ ) SELECT 'ST_Difference(geometry, empty) == geometry', ST_AsBinary(ST_Difference(geometry, empty),'ndr') FROM inp;
+ WITH inp AS (SELECT
+ 'POLYGON EMPTY'::geometry as empty,
+ 'POLYGON((0 0, 10 0, 5 5, 0 0))'::geometry as geometry
+- ) SELECT 'ST_Difference(empty, geometry) == empty', ST_Difference(empty, geometry) FROM inp;
++ ) SELECT 'ST_Difference(empty, geometry) == empty', ST_AsBinary(ST_Difference(empty, geometry),'ndr') FROM inp;
+ WITH inp AS (SELECT
+ 'POLYGON EMPTY'::geometry as empty,
+ 'POLYGON((0 0, 10 0, 5 5, 0 0))'::geometry as geometry
+--- a/regress/empty_expected
++++ b/regress/empty_expected
+@@ -23,13 +23,13 @@
+ T3.16|
+ T3.17|
+ T3.18|
+-ST_Buffer(empty, tolerance) == empty|010300000000000000
+-ST_Union(geometry, empty) == geometry|0103000000010000000400000000000000000000000000000000000000000000000000244000000000000000000000000000001440000000000000144000000000000000000000000000000000
+-ST_Union(empty, empty) == empty|010300000000000000
+-ST_Intersection(geometry, empty) == geometry|010300000000000000
+-ST_Intersection(empty, empty) == empty|010300000000000000
+-ST_Difference(geometry, empty) == geometry|0103000000010000000400000000000000000000000000000000000000000000000000244000000000000000000000000000001440000000000000144000000000000000000000000000000000
+-ST_Difference(empty, geometry) == empty|010300000000000000
++ST_Buffer(empty, tolerance) == empty|\x010300000000000000
++ST_Union(geometry, empty) == geometry|\x0103000000010000000400000000000000000000000000000000000000000000000000244000000000000000000000000000001440000000000000144000000000000000000000000000000000
++ST_Union(empty, empty) == empty|\x010300000000000000
++ST_Intersection(geometry, empty) == geometry|\x010300000000000000
++ST_Intersection(empty, empty) == empty|\x010300000000000000
++ST_Difference(geometry, empty) == geometry|\x0103000000010000000400000000000000000000000000000000000000000000000000244000000000000000000000000000001440000000000000144000000000000000000000000000000000
++ST_Difference(empty, geometry) == empty|\x010300000000000000
+ ST_Distance(geometry, empty) == NULL|
+ ST_DWithin(geometry, empty, tolerance) == FALSE|f
+ ST_Within(geometry, empty) == FALSE|f
+--- a/regress/regress.sql
++++ b/regress/regress.sql
+@@ -245,7 +245,7 @@
+
+ select '150', ST_AsEWKT(ST_ForceCollection(ST_setsrid('POLYGON((0 0, 1 0, 1 1, 0 1, 0 0))'::geometry, 6)));
+
+-select '151', ST_MakeEnvelope(0, 0, 1, 1, 4326);
++select '151', ST_AsBinary(ST_MakeEnvelope(0, 0, 1, 1, 4326),'ndr');
+ select '152', ST_SRID(ST_MakeEnvelope(0, 0, 1, 1, 4326));
+ select '152.1', ST_SRID(ST_MakeEnvelope(0, 0, 1, 1)) = ST_SRID('POINT(0 0)'::geometry);
+ select '152.2', ST_SRID(ST_SetSRID(ST_MakeEnvelope(0, 0, 1, 1), 4326));
+@@ -259,7 +259,7 @@
+ select '159', ST_AsText(ST_CollectionExtract('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(LINESTRING(0 0, 1 1), POINT(1 1)),LINESTRING(2 2, 3 3))',3));
+ select '160', ST_AsText(ST_CollectionExtract('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(LINESTRING(0 0, 1 1), POINT(1 1)),LINESTRING(2 2, 3 3))',1));
+ select '161', ST_AsText(ST_CollectionExtract('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(LINESTRING(0 0, 1 1), GEOMETRYCOLLECTION(POINT(1 1))),LINESTRING(2 2, 3 3))',2));
+-select '162', ST_MakeLine(ST_GeomFromText('POINT(-11.1111111 40)'),ST_GeomFromText('LINESTRING(-11.1111111 70,70 -11.1111111)')) As result;
++select '162', ST_AsBinary(ST_MakeLine(ST_GeomFromText('POINT(-11.1111111 40)'),ST_GeomFromText('LINESTRING(-11.1111111 70,70 -11.1111111)')),'ndr') As result;
+ select '163', ST_AsEWKT('POLYGON((0 0 0, 1 0 0, 1 1 0, 0 1 0, 0 0 0))');
+ select '164', ST_AsEWKT('POLYGON((0 0 0, 1 0 0, 1 1 0, 0 1 0, 0 0 1))');
+ select '165', ST_AsEWKT('POLYGON((0 0 0, 1 0 0, 1 1 0, 0 1 0, 0 0.1 1))');
+--- a/regress/sql-mm-compoundcurve_expected
++++ b/regress/sql-mm-compoundcurve_expected
+@@ -66,11 +66,11 @@
+ public.compoundcurve.the_geom_3dz effectively removed.
+ public.compoundcurve.the_geom_3dm effectively removed.
+ public.compoundcurve.the_geom_2d effectively removed.
+-valid wkt compound curve 1|0109000000020000000102000000030000009FE5797057376340E09398B1B2373BC05AAE0A165F0963409F6760A2493D3DC0DB6286DFB057634082D8A1B32F843EC0010200000004000000DB6286DFB057634082D8A1B32F843EC075B4E4D0C60C634031FA5D1A371540C0D7197CED9B636340A3CB59A7630A41C050F4A72AC0FB6240974769FCE3CF41C0
+-valid wkt compound curve 2|0109000000010000000102000000060000009FE5797057376340E09398B1B2373BC05AAE0A165F0963409F6760A2493D3DC0DB6286DFB057634082D8A1B32F843EC075B4E4D0C60C634031FA5D1A371540C0D7197CED9B636340A3CB59A7630A41C050F4A72AC0FB6240974769FCE3CF41C0
+-valid wkt compound curve 3|0109000000010000000102000000030000000CE586D73CF36240BBC46888F0523BC0102E91C951E76240DF90A1BEC0F841C0F970C100FFD7624074ADE6CE86CD3BC0
+-valid wkt compound curve 4|0109000000020000000102000000030000009FE5797057376340E09398B1B2373BC05AAE0A165F0963409F6760A2493D3DC0DB6286DFB057634082D8A1B32F843EC0010800000005000000DB6286DFB057634082D8A1B32F843EC0DB6286DFB057634082D8A1B32F843EC075B4E4D0C60C634031FA5D1A371540C0D7197CED9B636340A3CB59A7630A41C050F4A72AC0FB6240974769FCE3CF41C0
+-valid wkt compound curve 5|010900000003000000010800000003000000468280E724BC6340BF4B46210B973BC0F890AEA18D8063402D9664151D483CC0EED64BB6EE726340903CA5BDA0863AC0010200000004000000EED64BB6EE726340903CA5BDA0863AC09FE5797057376340E09398B1B2373BC05AAE0A165F0963409F6760A2493D3DC0DB6286DFB057634082D8A1B32F843EC0010800000005000000DB6286DFB057634082D8A1B32F843EC0DB6286DFB057634082D8A1B32F843EC075B4E4D0C60C634031FA5D1A371540C0D7197CED9B636340A3CB59A7630A41C050F4A72AC0FB6240974769FCE3CF41C0
++valid wkt compound curve 1|\x0109000000020000000102000000030000009fe5797057376340e09398b1b2373bc05aae0a165f0963409f6760a2493d3dc0db6286dfb057634082d8a1b32f843ec0010200000004000000db6286dfb057634082d8a1b32f843ec075b4e4d0c60c634031fa5d1a371540c0d7197ced9b636340a3cb59a7630a41c050f4a72ac0fb6240974769fce3cf41c0
++valid wkt compound curve 2|\x0109000000010000000102000000060000009fe5797057376340e09398b1b2373bc05aae0a165f0963409f6760a2493d3dc0db6286dfb057634082d8a1b32f843ec075b4e4d0c60c634031fa5d1a371540c0d7197ced9b636340a3cb59a7630a41c050f4a72ac0fb6240974769fce3cf41c0
++valid wkt compound curve 3|\x0109000000010000000102000000030000000ce586d73cf36240bbc46888f0523bc0102e91c951e76240df90a1bec0f841c0f970c100ffd7624074ade6ce86cd3bc0
++valid wkt compound curve 4|\x0109000000020000000102000000030000009fe5797057376340e09398b1b2373bc05aae0a165f0963409f6760a2493d3dc0db6286dfb057634082d8a1b32f843ec0010800000005000000db6286dfb057634082d8a1b32f843ec0db6286dfb057634082d8a1b32f843ec075b4e4d0c60c634031fa5d1a371540c0d7197ced9b636340a3cb59a7630a41c050f4a72ac0fb6240974769fce3cf41c0
++valid wkt compound curve 5|\x010900000003000000010800000003000000468280e724bc6340bf4b46210b973bc0f890aea18d8063402d9664151d483cc0eed64bb6ee726340903ca5bda0863ac0010200000004000000eed64bb6ee726340903ca5bda0863ac09fe5797057376340e09398b1b2373bc05aae0a165f0963409f6760a2493d3dc0db6286dfb057634082d8a1b32f843ec0010800000005000000db6286dfb057634082d8a1b32f843ec0db6286dfb057634082d8a1b32f843ec075b4e4d0c60c634031fa5d1a371540c0d7197ced9b636340a3cb59a7630a41c050f4a72ac0fb6240974769fce3cf41c0
+ ERROR: incontinuous compound curve
+ ERROR: incontinuous compound curve
+ ERROR: geometry must have an odd number of points
+@@ -80,8 +80,8 @@
+ valid wkb compound curve 4|COMPOUNDCURVE((153.72942375 -27.2175704,152.29285719 -29.23940482,154.74034096 -30.51635287),CIRCULARSTRING(154.74034096 -30.51635287,154.74034096 -30.51635287,152.39926953 -32.16574411,155.11278414 -34.08116619,151.86720784 -35.62414508))
+ valid wkb compound curve 5|COMPOUNDCURVE(CIRCULARSTRING(157.87950492 -27.59001358,156.01728901 -28.28169378,155.59163966 -26.52589021),(155.59163966 -26.52589021,153.72942375 -27.2175704,152.29285719 -29.23940482,154.74034096 -30.51635287),CIRCULARSTRING(154.74034096 -30.51635287,154.74034096 -30.51635287,152.39926953 -32.16574411,155.11278414 -34.08116619,151.86720784 -35.62414508))
+ null response|
+-minpoints issues - pass|01090000000100000001020000000200000000000000000000000000000000000000000000000000F03F000000000000F03F
+-minpoints issues - pass|010900000001000000010800000003000000000000000000000000000000000000000000000000000000000000000000F03F000000000000F03F000000000000F03F
++minpoints issues - pass|\x01090000000100000001020000000200000000000000000000000000000000000000000000000000f03f000000000000f03f
++minpoints issues - pass|\x010900000001000000010800000003000000000000000000000000000000000000000000000000000000000000000000f03f000000000000f03f000000000000f03f
+ ERROR: geometry requires more points
+ ERROR: geometry requires more points
+ ERROR: geometry requires more points
+--- a/regress/sql-mm-curvepoly_expected
++++ b/regress/sql-mm-curvepoly_expected
+@@ -71,11 +71,11 @@
+ public.curvepolygon.the_geom_3dm effectively removed.
+ public.curvepolygon.the_geom_3dz effectively removed.
+ public.curvepolygon.the_geom_4d effectively removed.
+-valid wkt curve polygon 1|010A00000001000000010200000007000000CCDF061AD9F3614054093E6D99093EC0AB9085DBB6DD614081540229216040C0EBD7A828C33E62409BF026782A7E41C0000000C06BB2624000000020ADB440C08E632F616EAD6240C9F7B0BF1DD33DC09011EEC0DE4362407DD6672F76323EC0CCDF061AD9F3614054093E6D99093EC0
+-valid wkt curve polygon 2|010A00000002000000010200000007000000CCDF061AD9F3614054093E6D99093EC0AB9085DBB6DD614081540229216040C0EBD7A828C33E62409BF026782A7E41C0000000C06BB2624000000020ADB440C08E632F616EAD6240C9F7B0BF1DD33DC09011EEC0DE4362407DD6672F76323EC0CCDF061AD9F3614054093E6D99093EC00102000000060000006844C4FE011B6240342E2993E0423FC0D45DAF9D93066240C4A0C305D62240C000000080AC31624000000020FBBE40C0000000E0107F6240000000C0A10440C04E1C0C14624C6240BF3FB6405C793FC06844C4FE011B6240342E2993E0423FC0
+-valid wkt curve polygon 3|010A00000001000000010800000007000000CCDF061AD9F3614054093E6D99093EC0AB9085DBB6DD614081540229216040C0EBD7A828C33E62409BF026782A7E41C0000000C06BB2624000000020ADB440C08E632F616EAD6240C9F7B0BF1DD33DC09011EEC0DE4362407DD6672F76323EC0CCDF061AD9F3614054093E6D99093EC0
+-valid wkt curve polygon 4|010A00000002000000010800000007000000CCDF061AD9F3614054093E6D99093EC0AB9085DBB6DD614081540229216040C0EBD7A828C33E62409BF026782A7E41C0000000C06BB2624000000020ADB440C08E632F616EAD6240C9F7B0BF1DD33DC09011EEC0DE4362407DD6672F76323EC0CCDF061AD9F3614054093E6D99093EC00102000000060000006844C4FE011B6240342E2993E0423FC0D45DAF9D93066240C4A0C305D62240C000000080AC31624000000020FBBE40C0000000E0107F6240000000C0A10440C04E1C0C14624C6240BF3FB6405C793FC06844C4FE011B6240342E2993E0423FC0
+-valid wkt curve polygon 5|010A00000002000000010200000007000000CCDF061AD9F3614054093E6D99093EC0AB9085DBB6DD614081540229216040C0EBD7A828C33E62409BF026782A7E41C0000000C06BB2624000000020ADB440C08E632F616EAD6240C9F7B0BF1DD33DC09011EEC0DE4362407DD6672F76323EC0CCDF061AD9F3614054093E6D99093EC00109000000030000000108000000030000006844C4FE011B6240342E2993E0423FC0D45DAF9D93066240C4A0C305D62240C000000080AC31624000000020FBBE40C001020000000200000000000080AC31624000000020FBBE40C0000000E0107F6240000000C0A10440C0010800000003000000000000E0107F6240000000C0A10440C04E1C0C14624C6240BF3FB6405C793FC06844C4FE011B6240342E2993E0423FC0
++valid wkt curve polygon 1|\x010a00000001000000010200000007000000ccdf061ad9f3614054093e6d99093ec0ab9085dbb6dd614081540229216040c0ebd7a828c33e62409bf026782a7e41c0000000c06bb2624000000020adb440c08e632f616ead6240c9f7b0bf1dd33dc09011eec0de4362407dd6672f76323ec0ccdf061ad9f3614054093e6d99093ec0
++valid wkt curve polygon 2|\x010a00000002000000010200000007000000ccdf061ad9f3614054093e6d99093ec0ab9085dbb6dd614081540229216040c0ebd7a828c33e62409bf026782a7e41c0000000c06bb2624000000020adb440c08e632f616ead6240c9f7b0bf1dd33dc09011eec0de4362407dd6672f76323ec0ccdf061ad9f3614054093e6d99093ec00102000000060000006844c4fe011b6240342e2993e0423fc0d45daf9d93066240c4a0c305d62240c000000080ac31624000000020fbbe40c0000000e0107f6240000000c0a10440c04e1c0c14624c6240bf3fb6405c793fc06844c4fe011b6240342e2993e0423fc0
++valid wkt curve polygon 3|\x010a00000001000000010800000007000000ccdf061ad9f3614054093e6d99093ec0ab9085dbb6dd614081540229216040c0ebd7a828c33e62409bf026782a7e41c0000000c06bb2624000000020adb440c08e632f616ead6240c9f7b0bf1dd33dc09011eec0de4362407dd6672f76323ec0ccdf061ad9f3614054093e6d99093ec0
++valid wkt curve polygon 4|\x010a00000002000000010800000007000000ccdf061ad9f3614054093e6d99093ec0ab9085dbb6dd614081540229216040c0ebd7a828c33e62409bf026782a7e41c0000000c06bb2624000000020adb440c08e632f616ead6240c9f7b0bf1dd33dc09011eec0de4362407dd6672f76323ec0ccdf061ad9f3614054093e6d99093ec00102000000060000006844c4fe011b6240342e2993e0423fc0d45daf9d93066240c4a0c305d62240c000000080ac31624000000020fbbe40c0000000e0107f6240000000c0a10440c04e1c0c14624c6240bf3fb6405c793fc06844c4fe011b6240342e2993e0423fc0
++valid wkt curve polygon 5|\x010a00000002000000010200000007000000ccdf061ad9f3614054093e6d99093ec0ab9085dbb6dd614081540229216040c0ebd7a828c33e62409bf026782a7e41c0000000c06bb2624000000020adb440c08e632f616ead6240c9f7b0bf1dd33dc09011eec0de4362407dd6672f76323ec0ccdf061ad9f3614054093e6d99093ec00109000000030000000108000000030000006844c4fe011b6240342e2993e0423fc0d45daf9d93066240c4a0c305d62240c000000080ac31624000000020fbbe40c001020000000200000000000080ac31624000000020fbbe40c0000000e0107f6240000000c0a10440c0010800000003000000000000e0107f6240000000c0a10440c04e1c0c14624c6240bf3fb6405c793fc06844c4fe011b6240342e2993e0423fc0
+ ERROR: geometry contains non-closed rings
+ ERROR: geometry contains non-closed rings
+ ERROR: geometry contains non-closed rings
diff --git a/debian/pgversions b/debian/pgversions
index dcde5a0..708582c 100644
--- a/debian/pgversions
+++ b/debian/pgversions
@@ -1,2 +1,7 @@
# Note that postgis-2.1 is not recommended for 9.0, anymore.
+#
+# Also note: Listing each version individually triggers an issue on
+# distributions where the default version of Postgres isn't the newest
+# one. '9.0+' circumvents that issue with current pg_buildext.
+#
9.0+
diff --git a/debian/postgis.install b/debian/postgis.install
index 4b40989..d323e10 100644
--- a/debian/postgis.install
+++ b/debian/postgis.install
@@ -1,3 +1,2 @@
README.postgis usr/share/doc/postgis-doc/
usr/share/man
-usr/lib/postgresql/9.1/bin usr
diff --git a/debian/rules b/debian/rules
index dfde74f..7bb1f40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,8 +36,7 @@ debian/control: debian/control.in debian/pgversions
sed -e "s:NEWEST_PGVERSION:$$NEWEST_VERSION:" > $@.pgxs_tmp; \
for v in $$VERSIONS; \
do \
- grep -q "^$$v" debian/pgversions \
- && grep-dctrl -P PGVERSION $< \
+ grep-dctrl -P PGVERSION $< \
| sed -e "s:PGVERSION:$$v:" >> $@.pgxs_tmp; \
done; \
mv $@.pgxs_tmp $@) || (rm -f $@.pgxs_tmp; exit 1)
@@ -250,7 +249,7 @@ install-arch: build-arch
PGSQL_DOCDIR=/usr/share/doc \
PGSQL_MANDIR=/usr/share/man
-# Auto-create required .install file for the current Postgres version.
+# Auto-create required .install file for each Postgres major version
(set -e; \
for PGVER in $(OTHER_POSTGRES_VERSIONS) $(NEWEST_POSTGRES_VERSION); do \
cat $(CURDIR)/debian/postgresql-generic-postgis-2.1.install.in \
@@ -261,6 +260,12 @@ install-arch: build-arch
> $(CURDIR)/debian/postgresql-$$PGVER-postgis-2.1-scripts.install; \
done)
+# Copy binaries from the NEWEST_POSTGRES_VERSION build to the
+# 'postgis' binary package.
+ mkdir -p $(CURDIR)/debian/postgis/usr/bin
+ cp -r $(CURDIR)/debian/tmp/usr/lib/postgresql/$(NEWEST_POSTGRES_VERSION)/bin/* \
+ $(CURDIR)/debian/postgis/usr/bin/
+
dh_install -s
check: build-arch-stamp
--
PostGIS for PostgreSQL
More information about the Pkg-grass-devel
mailing list