.gitignore

@@ -144,6 +144,7 @@ raster/test/cunit/cu_tester
 raster/test/Makefile
 raster/test/regress/Makefile
 raster/test/regress/rtpostgis.sql
+raster/test/regress/loader/TiledAutoSkipNoData.tif
 regress/00-regress-install/
 regress/Makefile
 regress/core/Makefile

.travis.yml

@@ -4,13 +4,17 @@ services:
 language: c
 
 env:
-  - tag=pg11-geos37-gdal24-proj52 mode=garden
+  # Use the last stable release to run more tests
+  - tag=pg12-geos37-gdal30-proj611 mode=garden
+  - tag=pg12-geos37-gdal30-proj611 mode=tests
+  - tag=pg12-geos37-gdal30-proj611 mode=debug
+  - tag=pg12-geos37-gdal30-proj611 mode=coverage
+  - tag=pg12-geos37-gdal30-proj611 mode=usan_gcc
+  - tag=pg12-clang-geos37-gdal30-proj611 mode=usan_clang
+  - tag=pg12-geos37-gdal30-proj611 mode=nowagyu
+
+  # Run tests with different dependecy combinations
   - tag=latest mode=tests
-  - tag=pg11-geos37-gdal24-proj52 mode=debug
-  - tag=pg11-geos37-gdal24-proj52 mode=coverage
-  - tag=pg11-geos37-gdal24-proj52 mode=usan_gcc
-  - tag=pg11-clang-geos37-gdal24-proj52 mode=usan_clang
-  - tag=pg11-geos37-gdal24-proj52 mode=nowagyu
   - tag=pg11-geos37-gdal24-proj52 mode=tests
   - tag=pg10-geos36-gdal23-proj49 mode=tests
   - tag=pg96-geos36-gdal22-proj49 mode=tests

NEWS

+PostGIS 3.0.0alpha4
+2019/08/10
+For full changes and enhancements, refer to PostGIS 3.0.0.
+This version requires PostgreSQL 9.5+-12 and GEOS >= 3.6+
+Additional features enabled if you are running Proj6+ and PostgreSQL 12
+
+* Major highlights *
+  - #4433, 32-bit hash fix (requires reindexing hash(geometry) indexes) (Raúl Marín)
+  - #4445, Fix a bug in geometry_le (Raúl Marín)
+  - #4451, Fix the calculation of gserialized_max_header_size (Raúl Marín)
+  - #4450, Speed up ST_GeometryType (Raúl Marín)
+  - #4452, Add ST_TileEnvelope() (Paul Ramsey)
+  - #4403, Support for shp2pgsql ability to reproject with copy mode (-D) (Regina Obe)
+  - #4417, Update spatial_ref_sys with new entries (Paul Ramsey)
+  - #4449, Speed up ST_X, ST_Y, ST_Z and ST_M (Raúl Marín)
+  - #4454, Speed up _ST_OrderingEquals (Raúl Marín)
+  - #4453, Speed up ST_IsEmpty (Raúl Marín)
+  - #4271, postgis_extensions_upgrade() also updates after pg_upgrade (Raúl Marín)
+  - #4466, Fix undefined behaviour in _postgis_gserialized_stats (Raúl Marín)
+  - #4209, Handle NULL geometry values in pgsql2shp (Paul Ramsey)
+  - #4419, Use protobuf version to enable/disable mvt/geobuf (Paul Ramsey)
+  - #4437, Handle POINT EMPTY in shape loader/dumper (Paul Ramsey)
+  - #4456, add Rasbery Pi 32-bit jenkins bot for testing (Bruce Rindahl,Regina Obe)
+  - #4420, update path does not exists for address_standardizer extension (Regina Obe)
+
 PostGIS 3.0.0alpha3
 2019/07/01
 For full changes and enhancements, refer to PostGIS 3.0.0.
@@ -93,6 +118,10 @@ Additional features enabled if you are running Proj6+ and PostgreSQL 12
   - #4334, Fix upgrade issues related to renamed function parameters (Raúl Marín)
   - #4442, raster2pgsql now skips NODATA tiles. Use -k option if you still want
            them in database for some reason. (Darafei Praliaskouski)
+  - #4433, 32-bit hash fix (requires reindexing hash(geometry) indexes) (Raúl Marín)
+  - #3383, Sorting now uses Hilbert curve and Postgres Abbreviated Compare.
+           You need to REINDEX your btree indexes if you had them.
+           (Darafei Praliaskouski)
 
 * New Features *
   - #2902, postgis_geos_noop (Sandro Santilli)
@@ -107,9 +136,10 @@ Additional features enabled if you are running Proj6+ and PostgreSQL 12
   - #1833, ST_AsGeoJSON(row) generates full GeoJSON Features (Joe Conway)
   - #3687, Casts json(geometry) and jsonb(geometry) for implicit GeoJSON
            generation (Paul Ramsey)
+  - #4198, Add ST_ConstrainedDelaunayTriangles SFCGAL function (Darafei
+           Praliaskouski)
 
-* Enhancements and fixes *
-  - #4342, Move deprecated functions into legacy.sql file
+* Enhancements *
   - #4341, Using "support function" API in PgSQL 12+ to replace SQL inlining
            as the mechanism for providing index support under ST_Intersects, et al
   - #4330, postgis_restore OOM when output piped to an intermediate process
@@ -125,22 +155,10 @@ Additional features enabled if you are running Proj6+ and PostgreSQL 12
   - #4176, ST_Intersects supports GEOMETRYCOLLECTION (Darafei Praliaskouski)
   - #4181, ST_AsMVTGeom: Avoid type changes due to validation (Raúl Marín)
   - #4183, ST_AsMVTGeom: Drop invalid geometries after simplification (Raúl Marín)
-  - #4188, Avoid division by zero in KMeans (Raúl Marín)
-  - #4189, Fix undefined behaviour in SADFWrite (Raúl Marín)
-  - #4191, Fix undefined behaviour in ptarray_clone_deep (Raúl Marín)
-  - #4211, Fix ST_Subdivide for minimal exterior ring with minimal hole (Darafei
-           Praliaskouski)
-  - #3457, Fix raster envelope shortcut in ST_Clip (Sai-bot)
   - #4215, Use floating point compare in ST_DumpAsPolygons (Darafei Praliaskouski)
   - #4155, Support for GEOMETRYCOLLECTION, POLYGON, TIN, TRIANGLE in
            ST_LocateBetween and ST_LocateBetweenElevations (Darafei Praliaskouski)
   - #2767, Documentation for AddRasterConstraint optional parameters (Sunveer Singh)
-  - #4326, Allocate enough memory in gidx_to_string (Raúl Marín)
-  - #4190, Avoid undefined behaviour in gserialized_estimate (Raúl Marín)
-  - #4233, Fix undefined behaviour in gserialized_spgist_picksplit_nd (Raúl Marín)
-  - #4247, Avoid undefined behaviour in next_float functions (Raúl Marín)
-  - #4249, Fix undefined behaviour in raster intersection (Raúl Marín)
-  - #4246, Fix undefined behaviour in ST_3DDistance (Raúl Marín)
   - #4244, Avoid unaligned memory access in BOX2D_out (Raúl Marín)
   - #4139, Make mixed-dimension ND index build tree correctly (Darafei Praliaskouski,
            Arthur Lesuisse, Andrew Gierth, Raúl Marín)
@@ -151,17 +169,13 @@ Additional features enabled if you are running Proj6+ and PostgreSQL 12
   - #4301, ST_Subdivide: fix endless loop on coordinates near coincident to bounds
            (Darafei Praliaskouski)
   - #4289, ST_AsMVTGeom: Transform coordinates space before clipping (Raúl Marín)
-  - #4275, Avoid passing a NULL pointer to GEOSisEmpty (Raúl Marín)
-  - #4296, Use `server_version_num` instead of parsing `version()` (Raúl Marín)
   - #4272, Improve notice message when unable to compute stats (Raúl Marín)
-  - #4314, ST_ClipByBox2D: Do not throw when the geometry is invalid (Raúl Marín)
   - #4313, #4307, PostgreSQL 12 compatibility (Laurenz Albe, Raúl Marín)
   - #4299, #4304, ST_GeneratePoints is now VOLATILE. IMMUTABLE version with
            seed parameter added. (Mike Taves)
   - #4278, ST_3DDistance and ST_3DIntersects now support Solid TIN and Solid
            POLYHEDRALSURFACE (Darafei Praliaskouski)
   - #4348, ST_AsMVTGeom (GEOS): Enforce validation at all times (Raúl Marín)
-  - #4361, Fix postgis_type_name with (GEOMETRYM,3) (Matt Bretl)
   - #4295, Allow GEOMETRYCOLLECTION in ST_Overlaps, ST_Contains, ST_ContainsProperly,
            ST_Covers, ST_CoveredBy, ST_Crosses, ST_Touches, ST_Disjoint, ST_Relate,
            ST_Equals (Esteban Zimányi)
@@ -172,21 +186,50 @@ Additional features enabled if you are running Proj6+ and PostgreSQL 12
   - #4368, Reorder LWGEOM struct members to minimize extra padding (Raúl Marín)
   - #4141, Use uint64 to handle row counts in the topology extension (Raúl Marín)
   - #4225, Upgrade tiger to use tiger 2018 census files
-  - #4198, Add ST_ConstrainedDelaunayTriangles SFCGAL function (Darafei
-           Praliaskouski)
   - #4412, Support ingesting rasters with NODATA=NaN (Darafei Praliaskouski)
   - #4413, Raster tile size follows GeoTIFF block size on raster2pgsql -t auto
            (Darafei Praliaskouski)
   - #4422, Modernize Python 2 code to get ready for Python 3 (Christian Clauss)
-  - #4383, Fix undefined behaviour in implicit conversions (Raúl Marín)
   - #4352, Use CREATE OR REPLACE AGGREGATE for PG12+ (Raúl Marín)
+  - #4394, Allow FULL OUTER JOIN on geometry equality operator (Darafei Praliaskouski)
+  - #4441, Make GiST penalty friendly to multi-column indexes and build single-column
+           ones faster. (Darafei Praliaskouski)
+  - #4403, Support for shp2pgsql ability to reproject with copy mode (-D) (Regina Obe)
+  - #4410, More descriptive error messages about SRID mismatch (Darafei Praliaskouski)
+  - #4399, TIN and Triangle output support in all output functions (Darafei
+           Praliaskouski)
+  - #3719, Impose minimum number of segments per arc during linearization
+           (Dan Baston / City of Helsinki, Raúl Marín)
+  - #4277, ST_GeomFromGeoJSON now marks SRID=4326 by default as per RFC7946,
+           ST_AsGeoJSON sets SRID in JSON output if it differs from 4326.
+           (Darafei Praliaskouski)
+
+* Fixes *
+  - #4342, Move deprecated functions into legacy.sql file
+  - #4445, Fix a bug in geometry_le (Raúl Marín)
+  - #4189, Fix undefined behaviour in SADFWrite (Raúl Marín)
+  - #4191, Fix undefined behaviour in ptarray_clone_deep (Raúl Marín)
+  - #4211, Fix ST_Subdivide for minimal exterior ring with minimal hole (Darafei
+           Praliaskouski)
+  - #4326, Allocate enough memory in gidx_to_string (Raúl Marín)
+  - #4190, Avoid undefined behaviour in gserialized_estimate (Raúl Marín)
+  - #4233, Fix undefined behaviour in gserialized_spgist_picksplit_nd (Raúl Marín)
+  - #4247, Avoid undefined behaviour in next_float functions (Raúl Marín)
+  - #4249, Fix undefined behaviour in raster intersection (Raúl Marín)
+  - #4246, Fix undefined behaviour in ST_3DDistance (Raúl Marín)
+  - #4188, Avoid division by zero in KMeans (Raúl Marín)
+  - #3457, Fix raster envelope shortcut in ST_Clip (Sai-bot)
+  - #4361, Fix postgis_type_name with (GEOMETRYM,3) (Matt Bretl)
+  - #4275, Avoid passing a NULL pointer to GEOSisEmpty (Raúl Marín)
+  - #4296, Use `server_version_num` instead of parsing `version()` (Raúl Marín)
+  - #4314, ST_ClipByBox2D: Do not throw when the geometry is invalid (Raúl Marín)
+  - #4383, Fix undefined behaviour in implicit conversions (Raúl Marín)
   - #4334, Fix upgrade issues related to renamed function parameters (Raúl Marín)
   - #4388, AddRasterConstraints: Ignore NULLs when generating constraints (Raúl Marín)
   - #4327, Avoid pfree'ing the result of getenv (Raúl Marín)
   - #4406, Throw on invalid characters when decoding geohash (Raúl Marín)
-  - #4394, Allow FULL OUTER JOIN on geometry equality operator (Darafei Praliaskouski)
-  - #4441, Make GiST penalty friendly to multi-column indexes and build single-column
-           ones faster. (Darafei Praliaskouski)
+  - #4459, Fix ST_Subdivide crash on intermediate EMPTY (Darafei Praliaskouski)
+  - #4470, ST_GeomFromGeoJSON crash on empty rings (Darafei Praliaskouski)
 
 
 PostGIS 2.5.0

README.md

@@ -4,6 +4,7 @@ Winnie:
  [![Build Status](https://winnie.postgis.net:444/buildStatus/icon?job=PostGIS_trunk)](https://winnie.postgis.net:444/view/PostGIS/job/PostGIS_trunk/)
 Dronie:
  [![Build Status](https://dronie.osgeo.org/api/badges/postgis/postgis/status.svg?branch=svn-trunk)](https://dronie.osgeo.org/postgis/postgis?branch=svn-trunk)
+ 
 Travis:
  [![Build Status](https://api.travis-ci.org/postgis/postgis.svg?branch=svn-trunk,svn-2.5,svn-2.4,svn-2.3)](http://travis-ci.org/postgis/postgis)
 GitLab-CI:
@@ -12,6 +13,14 @@ Drone.io:
  [![Build Status](https://cloud.drone.io/api/badges/postgis/postgis/status.svg?branch=svn-trunk)](https://cloud.drone.io/postgis/postgis?branch=svn-trunk)
 
 
+Bessie:
+ [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_Worker_Run%2Flabel%3Dbessie)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=bessie/) 
+Bessie32:
+ [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_Worker_Run%2Flabel%3Dbessie32)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=bessie32/) 
+Berrie:
+ [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_Worker_Run%2Flabel%3Dberrie)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=berrie/)
+
+
 This file is here to play nicely with modern code repository facilities.
 Actual readme is [here](README.postgis).
 

Version.config

@@ -5,7 +5,7 @@
 
 POSTGIS_MAJOR_VERSION=3
 POSTGIS_MINOR_VERSION=0
-POSTGIS_MICRO_VERSION=0alpha3
+POSTGIS_MICRO_VERSION=0alpha4
 
 # Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
 # when changing POSTGIS_MINOR_VERSION

ci/berrie/pg_init_start.sh

+#Berrie is a 32-bit Rasberry Pi managed by Bruce Rindahl
+#This is script to launch custom compiled PostgreSQL
+#export label=berrie #this is passed in via Jenkins
+export WORKSPACE=/home/jenkins/workspace
+
+
+
+export OS_BUILD=32
+export PG_VER=12
+export PGPATH=${WORKSPACE}/pg/label/${label}/rel/pg${PG_VER}w${OS_BUILD}
+export PATH=${PATH}:${PGPATH}/bin:${PGPATH}/lib
+export PGPORT=55432
+export PGDATA=$PGPATH/data_${PGPORT}
+export PGLOG="$PGDATA/pgsql.log"
+# What to use to start up the postmaster
+DAEMON="$PGPATH/bin/pg_ctl -D $PGDATA -l logfile start"
+
+# What to use to shut down the postmaster
+PGCTL="$PGPATH/bin/pg_ctl"
+
+# remove cluster if exists
+if [ -d $PGDATA ] ; then
+    if [ -d $PGDATA/postmaster.pid] ; then
+    	$PGCTL stop -D $PGDATA -s -m fast
+    fi;
+	
+    rm -rf $PGDATA
+fi;
+
+#initialize cluster
+$PGPATH/bin/initdb
+
+echo -n "Starting PostgreSQL: "
+$DAEMON &
+#sleep a bit because sometimes postgres takes a bit to start up
+sleep 20
+echo "ok"
+exit 0
\ No newline at end of file

ci/berrie/postgis_regress.sh

+#!/bin/bash
+#bessie is a 32-bit Rasberry Pi managed by Bruce Rindahl
+## BRANCH is passed in via jenkins which is set via gitea web hook
+#export BRANCH=618a67b1d6fc223dd5a4c0b02c824939f21dbd65
+## label is set by jenkins
+#export label=${label}
+
+export WORKSPACE=/home/jenkins/workspace
+
+cd ${WORKSPACE}/PostGIS_Worker_Run/label/${label}/$BRANCH
+export OS_BUILD=32
+export PG_VER=12
+export PGPATH=${WORKSPACE}/pg/label/${label}/rel/pg${PG_VER}w${OS_BUILD}
+
+export PATH=${PATH}:${PGPATH}/bin:${PGPATH}/lib
+export PGPORT=55432
+export PGDATA=$PGPATH/data_${PGPORT}
+export PGHOST=localhost
+
+sh autogen.sh
+./configure --with-pgconfig=${PGPATH}/bin/pg_config
+#make clean
+make
+export err_status=0
+make check RUNTESTFLAGS="-v"
+make install
+make check RUNTESTFLAGS="-v --extension"
+err_status=$?
+
+if [ -d $PGDATA/postmaster.pid ] ; then
+	$PGCTL stop -D $PGDATA -s -m fast
+fi
+exit $err_status
\ No newline at end of file

ci/bessie32/postgis_regress.sh

 export PATH=${PATH}:/usr/local:/usr/local/lib:/usr/local/bin
 sh autogen.sh
-./configure --with-projdir=/usr/local --with-libiconv=/usr/local --without-interrupt-tests
+./configure --with-libiconv=/usr/local --without-interrupt-tests
 make clean
 make
 export PGUSER=postgres

ci/winnie/build_postgis.sh

@@ -8,7 +8,7 @@ if  [[ "${OVERRIDE}" == '' ]] ; then
 	export CGAL_VER=4.11
 	export ICON_VER=1.15
 	export ZLIB_VER=1.2.11
-  	export PROTOBUF_VER=3.2.0
+  export PROTOBUF_VER=3.2.0
 	export PROTOBUFC_VER=1.2.1
 	export JSON_VER=0.12
 	export PROJSO=libproj-12.dll
@@ -170,7 +170,6 @@ LDFLAGS="-L${PGPATH}/lib -L${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYP
   --prefix=${PROJECTS}/postgis/liblwgeom-${POSTGIS_VER}w${OS_BUILD}${GCC_TYPE}
 fi;
 
-
 make clean
 
 #patch liblwgeom generated make to get rid of dynamic linking

ci/winnie/package_postgis.sh

@@ -15,8 +15,6 @@
 #if no override is set - use these values
 #otherwise use the ones jenkins passes thru
 #!/bin/bash
-#!/bin/bash
-set -e
 if  [[ "${OVERRIDE}" == '' ]] ; then
 	export GEOS_VER=3.8
 	export GDAL_VER=2.2.4
@@ -64,7 +62,7 @@ echo "LIBXML_VER $LIBXML_VER"
 echo "CGAL_VER $CGAL_VER"
 
 export PROJECTS=/projects
-export MINGPROJECTS=/projects
+export PROJECTS=/projects
 export PATHOLD=$PATH
 
 
@@ -115,7 +113,7 @@ export RELDIR=${PROJECTS}/postgis/builds/${POSTGIS_MINOR_VER}
 export RELVERDIR=postgis-pg${REL_PGVER}-binaries-${POSTGIS_MICRO_VER}w${OS_BUILD}${GCC_TYPE}
 export PATH="${PATHOLD}:${PGPATH}/bin:${PGPATH}/lib"
 export PCRE_VER=8.33 
-#PATH="${PGPATH}/bin:${PGPATH}/lib:${MINGPROJECTS}/xsltproc:${MINGPROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/gtkw${OS_BUILD}/bin:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin:${MINGPROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/include:${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/bin:${PATH}"
+#PATH="${PGPATH}/bin:${PGPATH}/lib:${PROJECTS}/xsltproc:${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/gtkw${OS_BUILD}/bin:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/include:${PROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/bin:${PATH}"
 #echo PATH AFTER: $PATH
 outdir="${RELDIR}/${RELVERDIR}"
 package="${RELDIR}/${RELVERDIR}.zip"
@@ -137,11 +135,11 @@ cp ${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll  $outdi
 # it seems 9.2 and 9.3 doesn't come with its own libiconv good grief
 # and trying to use their libiconv2.dll makes shp2pgsql crash
 if [[ "$PG_VER" == *9.2* || "$PG_VER" == *9.3* ]]; then
-	cp ${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/bin/*.dll  $outdir/bin
+	cp ${PROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/bin/*.dll  $outdir/bin
 fi;
 cp ${PGPATHEDB}/bin/libpq.dll  $outdir/bin/postgisgui
 #cp ${PGPATHEDB}/bin/libiconv2.dll  $outdir/bin/postgisgui
-cp ${MINGPROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/bin/libicon*.dll $outdir/bin/postgisgui
+cp ${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/bin/libicon*.dll $outdir/bin/postgisgui
 cp ${PGPATHEDB}/bin/libintl*.dll $outdir/bin/postgisgui
 
 cp ${PGPATHEDB}/bin/ssleay32.dll $outdir/bin/postgisgui
@@ -159,11 +157,11 @@ cp -r ${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/lib/*.dll $outdir/bin/postgisgui/li
 cp -r ${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/lib/gdk-pixbuf-2.0 $outdir/bin/postgisgui/lib
 
 
-cp ${MINGPROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/share/proj/* $outdir/share/contrib/postgis-${POSTGIS_MINOR_VER}/proj
-cp ${MINGPROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin
+cp ${PROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/share/proj/* $outdir/share/contrib/postgis-${POSTGIS_MINOR_VER}/proj
+cp ${PROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin
 cp -p ${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin
 
-cp ${MINGPROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin/postgisgui
+cp ${PROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin/postgisgui
 cp -p ${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin/postgisgui
 
 #for protobuf
@@ -203,8 +201,8 @@ fi;
 
 echo "PROTOBUF VERSION: ${PROTOBUF_VER} https://github.com/google/protobuf" >> $verfile
 echo "PROTOBUF-C VERSION: ${PROTOBUFC_VER} https://github.com/protobuf-c/protobuf-c"  >> $verfile
-#cp ${MINGPROJECTS}/libxml/rel-libxml2-2.7.8w${OS_BUILD}/bin/*.dll  $outdir/bin/
-cp ${PGPATHEDB}/bin/libxml2-2.dll   $outdir/bin/
+cp ${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}/bin/*.dll  $outdir/bin/
+#cp ${PGPATHEDB}/bin/libxml2-2.dll   $outdir/bin/
 
 cd ${POSTGIS_SRC}
 strip postgis/*.dll

configure

@@ -684,6 +684,7 @@ GTK_CFLAGS
 HAVE_PROTOBUF
 PROTOBUF_LDFLAGS
 PROTOBUF_CPPFLAGS
+PROTOCC_VERSION
 PROTOCC
 PROTOBUFC_LIBS
 PROTOBUFC_CFLAGS
@@ -17832,6 +17833,62 @@ $as_echo "#define HAVE_LIBPROTOBUF 1" >>confdefs.h
     	fi
     fi
+        if test "$HAVE_PROTOBUF" = "yes"; then
+        # Extract the first word of "protoc-c", so it can be a program name with args.
+set dummy protoc-c; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PROTOCC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PROTOCC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PROTOCC="$PROTOCC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PROTOCC="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PROTOCC=$ac_cv_path_PROTOCC
+if test -n "$PROTOCC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROTOCC" >&5
+$as_echo "$PROTOCC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+        PROTOCC_SEMVER=$($PROTOCC --version | grep protobuf-c | awk '{print $2}')
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking protoc-c version... $PROTOCC_SEMVER" >&5
+$as_echo "checking protoc-c version... $PROTOCC_SEMVER" >&6; }
+        PROTOCC_VERSION_MAJOR=$(echo "$PROTOCC_SEMVER" | tr '.' ' ' | awk '{print $1}')
+        PROTOCC_VERSION_MINOR=$(echo "$PROTOCC_SEMVER" | tr '.' ' ' | awk '{print $2}')
+        PROTOCC_VERSION_PATCH=$(echo "$PROTOCC_SEMVER" | tr '.' ' ' | awk '{print $3}')
+        PROTOCC_VERSION=$(expr 10000 \* $PROTOCC_VERSION_MAJOR + 100 \* $PROTOCC_VERSION_MINOR + $PROTOCC_VERSION_PATCH)
+        if test $PROTOCC_VERSION -ge 10100; then
+
+$as_echo "#define HAVE_GEOBUF 1" >>confdefs.h
+
+        fi
+    fi
+
+
@@ -25532,8 +25589,14 @@ $as_echo "  Libxml2 config:       ${XML2CONFIG}" >&6; }
 $as_echo "  Libxml2 version:      ${POSTGIS_LIBXML2_VERSION}" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result:   JSON-C support:       ${HAVE_JSON}" >&5
 $as_echo "  JSON-C support:       ${HAVE_JSON}" >&6; }
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: result:   protobuf-c support:   ${HAVE_PROTOBUF}" >&5
 $as_echo "  protobuf-c support:   ${HAVE_PROTOBUF}" >&6; }
+if test "x$HAVE_PROTOBUF" = "xyes"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result:   protobuf-c version:   ${PROTOCC_SEMVER}" >&5
+$as_echo "  protobuf-c version:   ${PROTOCC_SEMVER}" >&6; }
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: result:   PCRE support:         ${HAVE_PCRE}" >&5
 $as_echo "  PCRE support:         ${HAVE_PCRE}" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result:   Perl:                 ${PERL}" >&5

configure.ac

@@ -1044,6 +1044,21 @@ if test "$CHECK_PROTOBUF" != "no"; then
     	fi
     fi
 
+    dnl Get version number for protoc-c
+    if test "$HAVE_PROTOBUF" = "yes"; then
+        AC_PATH_PROG(PROTOCC, protoc-c)
+        PROTOCC_SEMVER=$($PROTOCC --version | grep protobuf-c | awk '{print $2}')
+        AC_MSG_RESULT([checking protoc-c version... $PROTOCC_SEMVER])
+        PROTOCC_VERSION_MAJOR=$(echo "$PROTOCC_SEMVER" | tr '.' ' ' | awk '{print $1}')
+        PROTOCC_VERSION_MINOR=$(echo "$PROTOCC_SEMVER" | tr '.' ' ' | awk '{print $2}')
+        PROTOCC_VERSION_PATCH=$(echo "$PROTOCC_SEMVER" | tr '.' ' ' | awk '{print $3}')
+        PROTOCC_VERSION=$(expr 10000 \* $PROTOCC_VERSION_MAJOR + 100 \* $PROTOCC_VERSION_MINOR + $PROTOCC_VERSION_PATCH)
+        if test $PROTOCC_VERSION -ge 10100; then
+            AC_DEFINE([HAVE_GEOBUF], [1], [Define to 1 if libprotobuf-c is >= 1.1])
+        fi
+    fi
+
+    AC_SUBST([PROTOCC_VERSION])
     AC_SUBST([PROTOBUF_CPPFLAGS])
     AC_SUBST([PROTOBUF_LDFLAGS])
     AC_SUBST([HAVE_PROTOBUF])
@@ -1626,7 +1641,12 @@ AC_MSG_RESULT([  PROJ4 version:        ${POSTGIS_PROJ_VERSION}])
 AC_MSG_RESULT([  Libxml2 config:       ${XML2CONFIG}])
 AC_MSG_RESULT([  Libxml2 version:      ${POSTGIS_LIBXML2_VERSION}])
 AC_MSG_RESULT([  JSON-C support:       ${HAVE_JSON}])
+
 AC_MSG_RESULT([  protobuf-c support:   ${HAVE_PROTOBUF}])
+if test "x$HAVE_PROTOBUF" = "xyes"; then
+  AC_MSG_RESULT([  protobuf-c version:   ${PROTOCC_SEMVER}])
+fi
+
 AC_MSG_RESULT([  PCRE support:         ${HAVE_PCRE}])
 AC_MSG_RESULT([  Perl:                 ${PERL}])
 AC_MSG_RESULT([  Wagyu:                ${HAVE_WAGYU}])

debian/changelog

+postgis (3.0.0~alpha4+dfsg-1) experimental; urgency=medium
+
+  * New upstream alpha release.
+  * Drop cppflags patch, applied upstream.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 11 Aug 2019 09:46:58 +0200
+
 postgis (3.0.0~alpha3+dfsg-1~exp2) experimental; urgency=medium
 
   [ Christoph Berg ]

debian/patches/cppflags

-Description: Add CPPFLAGS where missing. Spotted by blhc.
-
---- a/libpgcommon/Makefile.in
-+++ b/libpgcommon/Makefile.in
-@@ -58,7 +58,7 @@ check: libpgcommon.a
-
- # Command to build each of the .o files
- $(SA_OBJS): %.o: %.c
--	$(CC) $(CFLAGS) -c -o $@ $<
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
-
- $(SA_OBJS): ../postgis_config.h
-
---- a/loader/Makefile.in
-+++ b/loader/Makefile.in
-@@ -88,13 +88,13 @@ $(LIBLWGEOM):
- 	$(MAKE) -C ../liblwgeom
-
- shp2pgsql-core.o: shp2pgsql-core.c shp2pgsql-core.h shpcommon.h
--	$(CC) $(CFLAGS) -c $<
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
-
- pgsql2shp-core.o: pgsql2shp-core.c pgsql2shp-core.h shpcommon.h
--	$(CC) $(CFLAGS) $(PGSQL_FE_CPPFLAGS) -c $<
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(PGSQL_FE_CPPFLAGS) -c $<
-
- pgsql2shp-cli.o: pgsql2shp-cli.c pgsql2shp-core.h shpcommon.h
--	$(CC) $(CFLAGS) $(PGSQL_FE_CPPFLAGS) -c $<
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(PGSQL_FE_CPPFLAGS) -c $<
-
- $(PGSQL2SHP-CLI): $(SHPLIB_OBJS) pgsql2shp-core.o pgsql2shp-cli.o $(LIBLWGEOM)
- 	$(LIBTOOL) --mode=link \
-@@ -105,7 +105,7 @@ $(SHP2PGSQL-CLI): $(SHPLIB_OBJS) shp2pgs
- 	  $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS)
-
- shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgsql-core.h shpcommon.h
--	$(CC) $(CFLAGS) $(GTK_CFLAGS) $(PGSQL_FE_CPPFLAGS) -o $@ -c shp2pgsql-gui.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(GTK_CFLAGS) $(PGSQL_FE_CPPFLAGS) -o $@ -c shp2pgsql-gui.c
-
- $(SHP2PGSQL-GUI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-gui.o pgsql2shp-core.o $(LIBLWGEOM) $(GTK_WIN32_RES)
- 	$(LIBTOOL) --mode=link \
---- a/raster/loader/Makefile.in
-+++ b/raster/loader/Makefile.in
-@@ -79,7 +79,7 @@ LDFLAGS = \
- all: $(RASTER2PGSQL)
-
- raster2pgsql.o: raster2pgsql.c
--	$(CC) $(CFLAGS) -c $<
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
-
- $(RASTER2PGSQL): $(RT_CORE)/librtcore.a raster2pgsql.o
- 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@

debian/patches/series

 relax-test-timing-constraints.patch
-cppflags

doc/installation.xml

@@ -2483,6 +2483,34 @@ ALTER EXTENSION postgis_topology UPDATE TO "&last_release_version;next";</progra
 		<programlisting>ALTER TABLE spatial_ref_sys ADD CONSTRAINT spatial_ref_sys_srid_check check (srid &gt; 0 AND srid &lt; 999000 );</programlisting>
 
 		<programlisting>ALTER TABLE spatial_ref_sys ADD PRIMARY KEY(srid));</programlisting>
+	  
+		If you are upgrading an old database containing french <ulink url="https://en.wikipedia.org/wiki/Institut_g%C3%A9ographique_national">
+			IGN
+		  </ulink> cartography, you will have probably SRIDs out 
+		of range and you will see, when importing your database, issues like this :
+	  
+		<programlisting> WARNING: SRID 310642222 converted to 999175 (in reserved zone)</programlisting>
+	  
+		In this case, you can try following steps : first throw 
+		out completely the IGN from the sql which is resulting 
+		from postgis_restore.pl. So, after having run :
+	  
+		<programlisting>perl utils/postgis_restore.pl "/somepath/olddb.backup" > oldbb.sql</programlisting>
+
+		run this command :
+	  
+		<programlisting>grep -v IGNF olddb.sql > olddb-without-IGN.sql</programlisting>
+	  
+		Create then your newdb, activate the required Postgis extensions, 
+		and insert properly the french system IGN with :
+	  
+		<ulink url="https://raw.githubusercontent.com/Remi-C/IGN_spatial_ref_for_PostGIS/master/Put_IGN_SRS_into_Postgis.sql">
+			this script
+		  </ulink>
+	  
+		After these operations, import your data :
+	  
+		<programlisting>psql -h localhost -p 5432 -U postgres -d newdb -f olddb-without-IGN.sql  2> errors.txt</programlisting>
 
 	</para>
 	</listitem>

doc/po/de/extras.xml.po

 # SOME DESCRIPTIVE TITLE.
-# 
+#
 # Translators:
-# Andreas Schild <andreas.schild@bfw.gv.at>, 2017
+# Andreas Schild <andreas.schild@bfw.gv.at>, 2017-2019
 msgid ""
 msgstr ""
 "Project-Id-Version: PostGIS\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-01-28 07:02+0000\n"
-"PO-Revision-Date: 2017-06-04 10:32+0000\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-03 21:00+0000\n"
+"PO-Revision-Date: 2019-03-11 09:07+0000\n"
 "Last-Translator: Andreas Schild <andreas.schild@bfw.gv.at>\n"
-"Language-Team: German (http://www.transifex.com/postgis/postgis/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/postgis/postgis/language/"
+"de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
@@ -30,7 +31,12 @@ msgid ""
 "source tarballs and source repository. These are not always packaged with "
 "PostGIS binary releases, but are usually plpgsql based or standard shell "
 "scripts that can be run as is."
-msgstr "Dieses Kapitel beschreibt Features die sich in den zusätzlichen Verzeichnissen des PostGIS Quellcodes - Tarballs und Repository -  befinden. Diese sind nicht immer mit den binären PostGIS Veröffentlichung/Release paketiert, sind aber im allgemeinen plpgsql basiert oder es handelt sich um Shell Skripts die direkt aufgerufen werden können."
+msgstr ""
+"Dieses Kapitel beschreibt Funktionen, die sich in dem Verzeichnis \"extras\" "
+"des PostGIS Quellcodes (Tarball oder Repository) befinden. Diese sind nicht "
+"immer mit der binären PostGIS Release paketiert, es handelt sich dabei aber "
+"üblicherweise um Pl/Pgsql- oder Shell-Skripts, die direkt aufgerufen werden "
+"können."
 
 #. Tag: chapter
 #: extras.xml:6

doc/po/de/extras_historytable.xml.po

 # SOME DESCRIPTIVE TITLE.
-# 
+#
 # Translators:
-# Andreas Schild <andreas.schild@bfw.gv.at>, 2017
+# Andreas Schild <andreas.schild@bfw.gv.at>, 2017-2019
 # Chris Leick <c.leick@vollbio.de>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: PostGIS\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-01-28 07:02+0000\n"
-"PO-Revision-Date: 2017-06-04 10:29+0000\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-03 21:00+0000\n"
+"PO-Revision-Date: 2019-03-11 09:04+0000\n"
 "Last-Translator: Andreas Schild <andreas.schild@bfw.gv.at>\n"
-"Language-Team: German (http://www.transifex.com/postgis/postgis/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/postgis/postgis/language/"
+"de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
@@ -28,13 +29,21 @@ msgstr "Chronikverfolgung"
 #, no-c-format
 msgid ""
 "Suppose you have a table of data that represents the current state of a "
-"particular geographic feature. A parcels table, or a roads table, or a fruit"
-" trees table, whatever. Generally, GIS tools understand a table as a single "
+"particular geographic feature. A parcels table, or a roads table, or a fruit "
+"trees table, whatever. Generally, GIS tools understand a table as a single "
 "entity into which they can update, insert and delete rows from. How you do "
-"allow common GIS tools to work against your data, while maintaining an audit"
-" trail of what changes have been made, by whom, and what the past state of "
+"allow common GIS tools to work against your data, while maintaining an audit "
+"trail of what changes have been made, by whom, and what the past state of "
 "the data is?"
-msgstr "Angenommen, Sie haben eine Datentabelle, die den aktuellen Status einer bestimmten geografischen Funktionalität darstellt, etwa eine Pakettabelle, eine Straßentabelle, eine Obstbaumtabelle oder was auch immer. Im Allgemeinen betrachten GIS-Werkzeuge eine Tabelle als eine einzelne Einheit, in der sie Zeilen aktualisieren, einfügen oder löschen können. Wie ermöglichen Sie üblichen GIS-Werkzeugen mit Ihren Daten zu arbeiten, wenn eine Kontrolle durchgeführt wird, welche Änderungen gemacht wurden, durch wen und was der frühere Status der Daten ist?"
+msgstr ""
+"Angenommen, Sie haben eine Tabelle, die den aktuellen Stand eines bestimmten "
+"Geoobjektes darstellt; wie eine Grundstückstabelle, eine Straßentabelle, "
+"eine Obstbaumtabelle oder was auch immer. Im Allgemeinen betrachten GIS-"
+"Werkzeuge eine Tabelle als eine einzelne Einheit, in der sie Zeilen "
+"aktualisieren, einfügen oder löschen können. Wie ermöglicht man üblichen GIS-"
+"Werkzeugen so mit Daten zu arbeiten, dass eine Historiendokumentation "
+"geführt wird, welche Datenänderungen und die jeweiligen Bearbeiter enthält "
+"und vergangene Datenbestände wiederherstellen lässt?"
 
 #. Tag: para
 #: extras_historytable.xml:10
@@ -42,7 +51,10 @@ msgstr "Angenommen, Sie haben eine Datentabelle, die den aktuellen Status einer
 msgid ""
 "This <varname>history_table</varname> extra module provides some utility "
 "functions for creating and maintaining history."
-msgstr "Dieses Zusatzmodul <varname>history_table</varname> stellt einige Hilfswerkzeuge zum Erstellen und Verwalten der Chronik bereit."
+msgstr ""
+"Das Zusatzmodul <varname>history_table</varname> stellt einige "
+"Hilfswerkzeuge für die Erstellung und Erhaltung einer Chronikverfolgung "
+"bereit."
 
 #. Tag: para
 #: extras_historytable.xml:14
@@ -52,7 +64,12 @@ msgid ""
 "added to the documentation in PostGIS 2.0. This package is written in "
 "plpgsql and located in the <varname>extras/history_table</varname> of "
 "PostGIS source tar balls and source repository."
-msgstr "Die <varname>history_table</varname> wurde auch in PostGIS 1.5 paketiert, dieser Dokumentation aber erst in PostGIS 2.0 hinzugefügt. Dieses Paket wurde in PL/pgSQL geschrieben und befindet sich in <varname>extras/history_table</varname> der PostGIS-Quell-Tarballs und dem Quelldepot."
+msgstr ""
+"Das Modul <varname>history_table</varname> wurde zwar schon in PostGIS 1.5 "
+"mitpaketiert, ist dieser Dokumentation aber erst ab PostGIS 2.0 hinzugefügt "
+"worden. Das Modul wurde in PL/pgSQL geschrieben und befindet sich im "
+"Verzeichnis <varname>extras/history_table</varname> des PostGIS Quellcode "
+"Tarball und des Quellcode-Repository."
 
 #. Tag: para
 #: extras_historytable.xml:15
@@ -61,7 +78,11 @@ msgid ""
 "If you have a table 'roads', this module will maintain a 'roads_history' "
 "side table, which contains all the columns of the parent table, and the "
 "following additional columns:"
-msgstr "Falls Sie eine Tabelle »roads« haben, wird dieses Modul eine Nebentabelle »roads_history« verwalten, die alle Spalten der übergeordneten Tabelle sowie die folgenden zusätzlichen Spalten enthält:"
+msgstr ""
+"Wenn Sie zum Beispiel eine Tabelle »roads« haben, dann wird von diesem Modul "
+"die Nebentabelle »roads_history« geführt, die alle Spalten der "
+"übergeordneten Tabelle »roads« sowie die folgenden zusätzlichen Spalten "
+"aufweist:"
 
 #. Tag: programlisting
 #: extras_historytable.xml:16
@@ -71,19 +92,32 @@ msgid ""
 " date_added      | timestamp without time zone | not null default now()\n"
 " date_deleted    | timestamp without time zone |\n"
 " last_operation  | character varying(30)       | not null\n"
-" active_user     | character varying(90)       | not null default \"current_user\"()\n"
+" active_user     | character varying(90)       | not null default "
+"\"current_user\"()\n"
+" current_version | text                        | not null"
+msgstr ""
+"history_id      | integer                     | not null default\n"
+" date_added      | timestamp without time zone | not null default now()\n"
+" date_deleted    | timestamp without time zone |\n"
+" last_operation  | character varying(30)       | not null\n"
+" active_user     | character varying(90)       | not null default "
+"\"current_user\"()\n"
 " current_version | text                        | not null"
-msgstr "history_id      | integer                     | not null default\n date_added      | timestamp without time zone | not null default now()\n date_deleted    | timestamp without time zone |\n last_operation  | character varying(30)       | not null\n active_user     | character varying(90)       | not null default \"current_user\"()\n current_version | text                        | not null"
 
 #. Tag: para
 #: extras_historytable.xml:20
 #, no-c-format
 msgid ""
-"When you insert a new record into 'roads' a record is automatically inserted"
-" into 'roads_history', with the 'date_added' filled in the 'date_deleted' "
-"set to NULL, a unique 'history_id', a 'last_operation' of 'INSERT' and "
+"When you insert a new record into 'roads' a record is automatically inserted "
+"into 'roads_history', with the 'date_added' filled in the 'date_deleted' set "
+"to NULL, a unique 'history_id', a 'last_operation' of 'INSERT' and "
 "'active_user' set."
-msgstr "Wenn Sie einen neuen Datensatz in »roads« einfügen, wird automatisch ein neuer Datensatz in »roads_history« eingefügt, bei dem »date_added« ausgefüllt und »date_deleted« auf NULL gesetzt wird. Er hat eine eindeutige »history_id«, eine »last_operation« von »INSERT« und einen gesetzten »active_user«."
+msgstr ""
+"Wenn Sie einen neuen Datensatz in »roads« einfügen, wird automatisch ein "
+"neuer Datensatz in »roads_history« eingefügt, bei dem »date_added« "
+"ausgefüllt und »date_deleted« auf NULL gesetzt wird. Weiters enthält der "
+"Datensatz eine eindeutige »history_id«, eine »last_operation« von »INSERT« "
+"und einen »active_user«."
 
 #. Tag: para
 #: extras_historytable.xml:23
@@ -91,7 +125,10 @@ msgstr "Wenn Sie einen neuen Datensatz in »roads« einfügen, wird automatisch
 msgid ""
 "When you delete a record in 'roads', the record in the history table is "
 "*not* deleted, but the 'date_deleted' is set to the current date."
-msgstr "Wenn Sie einen Datensatz aus »roads« löschen, wird der Datensatz *nicht* aus »roads_history« gelöscht, das »date_deleted« jedoch auf das aktuelle Datum gesetzt."
+msgstr ""
+"Wenn Sie einen Datensatz in der Tabelle »roads« löschen, dann wird der "
+"Datensatz *nicht* aus der Tabelle »roads_history« gelöscht, aber der Wert "
+"von »date_deleted« auf das aktuelle Datum gesetzt."
 
 #. Tag: para
 #: extras_historytable.xml:26
@@ -100,7 +137,11 @@ msgid ""
 "When you update a record in 'roads', the current record has 'date_deleted' "
 "filled in and a new record is created with the 'date_added' set and "
 "'date_deleted' NULL."
-msgstr "Wenn Sie einen Datensatz in »roads« aktualisieren, wird beim aktuellen Datensatz »date_deleted« ausgefüllt und es wird ein neuer Datensatz mit gesetztem »date_added« erstellt, dessen »date_deleted« NULL ist."
+msgstr ""
+"Wenn Sie einen Datensatz in der Tabelle »roads« aktualisieren, dann wird in "
+"dem aktuellen Datensatz »date_deleted« eingetragen und ein neuer Datensatz "
+"erstellt, in dem »date_added« eingetragen wird und »date_deleted« auf NULL "
+"gesetzt ist."
 
 #. Tag: para
 #: extras_historytable.xml:30
@@ -108,7 +149,9 @@ msgstr "Wenn Sie einen Datensatz in »roads« aktualisieren, wird beim aktuellen
 msgid ""
 "With this information maintained, it is possible to retrieve the history of "
 "any record in the roads table:"
-msgstr "Mit der Verwaltung dieser Informationen ist es möglich, die Chronik aller Datensätze in der Tabelle »roads« abzufragen:"
+msgstr ""
+"Durch diese Informationen ist es möglich, die Chronik aller Datensätze in "
+"der Tabelle »roads« abzufragen:"
 
 #. Tag: programlisting
 #: extras_historytable.xml:31
@@ -120,7 +163,9 @@ msgstr "SELECT * FROM roads_history WHERE roads_pk = 111;"
 #: extras_historytable.xml:33
 #, no-c-format
 msgid "Or, to retrieve a view of the roads table at any point in the past:"
-msgstr "Oder, um eine Ansicht der Tabelle »roads« für einen beliebigen Zeitpunkt in der Vergangenheit zu erhalten:"
+msgstr ""
+"Oder, um einen View der Tabelle »roads« für einen beliebigen Zeitpunkt in "
+"der Vergangenheit zu erhalten:"
 
 #. Tag: programlisting
 #: extras_historytable.xml:34
@@ -129,7 +174,10 @@ msgid ""
 "SELECT * FROM roads_history\n"
 "    WHERE date_added &lt; 'January 1, 2001' AND\n"
 "        ( date_deleted &gt;= 'January 1, 2001' OR date_deleted IS NULL );"
-msgstr "SELECT * FROM roads_history\n    WHERE date_added &lt; 'January 1, 2001' AND\n        ( date_deleted &gt;= 'January 1, 2001' OR date_deleted IS NULL );"
+msgstr ""
+"SELECT * FROM roads_history\n"
+"    WHERE date_added &lt; 'January 1, 2001' AND\n"
+"        ( date_deleted &gt;= 'January 1, 2001' OR date_deleted IS NULL );"
 
 #. Tag: refname
 #: extras_historytable.xml:38
@@ -143,7 +191,9 @@ msgstr "Postgis_Install_History"
 msgid ""
 "Creates a table that will hold some interesting values for managing history "
 "tables."
-msgstr "erstellt eine Tabelle, die einige interessante Werte zum Verwalten von Chroniktabellen bereithalten wird."
+msgstr ""
+"Erstellt eine Tabelle, welche wesentliche Werte zur Verwaltung von "
+"Chroniktabellen beinhaltet."
 
 #. Tag: funcprototype
 #: extras_historytable.xml:44
@@ -151,7 +201,9 @@ msgstr "erstellt eine Tabelle, die einige interessante Werte zum Verwalten von C
 msgid ""
 "<funcdef>void <function>Postgis_Install_History</function></funcdef> "
 "<paramdef></paramdef>"
-msgstr "<funcdef>void <function>Postgis_Install_History</function></funcdef> <paramdef></paramdef>"
+msgstr ""
+"<funcdef>void <function>Postgis_Install_History</function></funcdef> "
+"<paramdef></paramdef>"
 
 #. Tag: title
 #: extras_historytable.xml:52 extras_historytable.xml:92
@@ -165,7 +217,10 @@ msgstr "Beschreibung"
 msgid ""
 "Creates a table that will hold some interesting values for managing history "
 "tables. Creates a table called <varname>historic_information</varname>"
-msgstr "erstellt eine Tabelle, die einige interessante Werte zum Verwalten von Chroniktabellen bereithalten wird. Es wird eine Tabelle namens <varname>historic_information</varname> erstellt."
+msgstr ""
+"Erstellt eine Tabelle, welche wesentliche Werte zur Verwaltung von "
+"Chroniktabellen beinhaltet. Legt eine Tabelle mit der Bezeichnung "
+"<varname>historic_information</varname> an"
 
 #. Tag: para
 #: extras_historytable.xml:58 extras_historytable.xml:100
@@ -201,9 +256,12 @@ msgstr "Postgis_Enable_History"
 #: extras_historytable.xml:78
 #, no-c-format
 msgid ""
-"Registers a tablein the history_information table for tracking and also adds"
-" in side line history table and insert, update, delete rules on the table."
-msgstr "registriert eine Tabelle zur Verfolgung in der Tabelle »history_information« und fügt außerdem innerhalb eine Zeilenchroniktabelle sowie Regeln zum Einfügen, Löschen und Aktualisieren in der Tabelle ein."
+"Registers a tablein the history_information table for tracking and also adds "
+"in side line history table and insert, update, delete rules on the table."
+msgstr ""
+"Registriert eine Tabelle zur Chronikverfolgung in der Tabelle "
+"»history_information«. Parallel dazu wird eine Chroniktabelle erstellt und "
+"die Regeln zum INSERT, UPDATE und DELETE an der Tabelle festgelegt."
 
 #. Tag: funcprototype
 #: extras_historytable.xml:83
@@ -212,7 +270,10 @@ msgid ""
 "<funcdef>boolean <function>Postgis_Enable_History</function></funcdef> "
 "<paramdef><type>text </type> <parameter>p_schema</parameter></paramdef> "
 "<paramdef><type>text </type> <parameter>p_table</parameter></paramdef>"
-msgstr "<funcdef>boolean <function>Postgis_Enable_History</function></funcdef> <paramdef><type>text </type> <parameter>p_schema</parameter></paramdef> <paramdef><type>text </type> <parameter>p_table</parameter></paramdef>"
+msgstr ""
+"<funcdef>boolean <function>Postgis_Enable_History</function></funcdef> "
+"<paramdef><type>text </type> <parameter>p_schema</parameter></paramdef> "
+"<paramdef><type>text </type> <parameter>p_table</parameter></paramdef>"
 
 #. Tag: para
 #: extras_historytable.xml:94
@@ -220,10 +281,17 @@ msgstr "<funcdef>boolean <function>Postgis_Enable_History</function></funcdef> <
 msgid ""
 "Registers a table in the history_information table for tracking and also "
 "adds in side line history table with same name as table but prefixed with "
-"<varname>history</varname> in the same schema as the original table. Puts in"
-" insert, update, delete rules on the table. Any inserts,updates,deletes of "
+"<varname>history</varname> in the same schema as the original table. Puts in "
+"insert, update, delete rules on the table. Any inserts,updates,deletes of "
 "the geometry are recorded in the history table."
-msgstr "registriert eine Tabelle zur Verfolgung in der Tabelle »history_information« und fügt außerdem innerhalb eine Zeilenchroniktabelle ein. Sie hat denselben Tabellennamen, dem jedoch ein <varname>history</varname> vorangestellt wird und dasselbe Schema wie die Originaltabelle. Darin werden Regeln zum Einfügen, Löschen und Aktualisieren in der Tabelle abgelegt. Jegliches Einfügen, Aktualisieren und Löschen wird in der Chroniktabelle aufgezeichnet."
+msgstr ""
+"Registriert eine Tabelle zur Chronikverfolgung in der Tabelle "
+"»history_information«. Parallel dazu wird eine Chroniktabelle im gleichen "
+"Schema wie die Ursprungstabelle erstellt; der Tabellenname ergibt sich aus "
+"der Bezeichnung der Ursprungstabelle und vorangestelltem <varname>history</"
+"varname>. Die Regeln zum Einfügen, Löschen und Aktualisieren der "
+"Ursprungstabelle werden in dieser Tabelle festgelegt. In der Chroniktabelle "
+"werden sämtliche INSERTs, UPDATEs und DELETEs der Geometrie aufgezeichnet."
 
 #. Tag: para
 #: extras_historytable.xml:97
@@ -232,7 +300,11 @@ msgid ""
 "This function currently relies on a geometry column being registered in "
 "<varname>geometry_columns</varname> and fails if the geometry column is not "
 "present in <varname>geometry_columns</varname> table."
-msgstr "Diese Funktion beruht derzeit darauf, dass eine Geometriespalte in <varname>geometry_columns</varname> registriert wurde. Sie scheitert, falls die Geometriespalte nicht in der Tabelle <varname>geometry_columns</varname> vorhanden ist."
+msgstr ""
+"Diese Funktion benötigt (zurzeit), dass eine Geometriespalte unter "
+"<varname>geometry_columns</varname> registriert wurde. Diese Funktion "
+"scheitert, wenn die Geometriespalte nicht in der Tabelle "
+"<varname>geometry_columns</varname> vorhanden ist."
 
 #. Tag: programlisting
 #: extras_historytable.xml:107
@@ -247,7 +319,29 @@ msgid ""
 "t\n"
 "\n"
 "INSERT INTO roads(road_name, geom)\n"
-"  VALUES('Test Street', ST_GeomFromText('LINESTRING(231660.5 832170,231647 832202,231627.5 832250.5)',26986));\n"
+"  VALUES('Test Street', ST_GeomFromText('LINESTRING(231660.5 832170,231647 "
+"832202,231627.5 832250.5)',26986));\n"
+"\n"
+"-- check transaction detail --\n"
+"SELECT date_added, last_operation, current_version\n"
+"FROM roads_history\n"
+"WHERE road_name = 'Test Street' ORDER BY date_added DESC;\n"
+"\n"
+"       date_added       | last_operation | current_version\n"
+"------------------------+----------------+-----------------\n"
+" 2011-02-07 12:44:36.92 | INSERT         | 2"
+msgstr ""
+"CREATE TABLE roads(gid SERIAL PRIMARY KEY, road_name varchar(150));\n"
+"SELECT AddGeometryColumn('roads', 'geom', 26986, 'LINESTRING', 2);\n"
+"\n"
+"SELECT postgis_enable_history('public', 'roads', 'geom') As register_table;\n"
+"register_table\n"
+"--------------\n"
+"t\n"
+"\n"
+"INSERT INTO roads(road_name, geom)\n"
+"  VALUES('Test Street', ST_GeomFromText('LINESTRING(231660.5 832170,231647 "
+"832202,231627.5 832250.5)',26986));\n"
 "\n"
 "-- check transaction detail --\n"
 "SELECT date_added, last_operation, current_version\n"
@@ -257,4 +351,3 @@ msgid ""
 "       date_added       | last_operation | current_version\n"
 "------------------------+----------------+-----------------\n"
 " 2011-02-07 12:44:36.92 | INSERT         | 2"
-msgstr "CREATE TABLE roads(gid SERIAL PRIMARY KEY, road_name varchar(150));\nSELECT AddGeometryColumn('roads', 'geom', 26986, 'LINESTRING', 2);\n\nSELECT postgis_enable_history('public', 'roads', 'geom') As register_table;\nregister_table\n--------------\nt\n\nINSERT INTO roads(road_name, geom)\n  VALUES('Test Street', ST_GeomFromText('LINESTRING(231660.5 832170,231647 832202,231627.5 832250.5)',26986));\n\n-- check transaction detail --\nSELECT date_added, last_operation, current_version\nFROM roads_history\nWHERE road_name = 'Test Street' ORDER BY date_added DESC;\n\n       date_added       | last_operation | current_version\n------------------------+----------------+-----------------\n 2011-02-07 12:44:36.92 | INSERT         | 2"