Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@
 *.gcda
 *.gcno
 gmon.out
-postgis_svn_revision.h
 aclocal.m4
 autom4te.cache/
 build-aux/
@@ -187,3 +186,8 @@ postgis/uninstall_sfcgal.sql

 deps/Makefile
 deps/wagyu/Makefile
+
+#generated files
+postgis_revision.h
+postgis_svn_revision.h
+ChangeLog 
--- a/ChangeLog
+++ b/ChangeLog
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -25,7 +25,7 @@ all install uninstall noop clean distclean check-unit check-regress:
 		echo "PostGIS was built successfully. Ready to install."; \
 	fi

-all: postgis_svn_revision.h
+all: postgis_revision.h

 ifeq (@LIBLWGEOM_ONLY@,no)
 install: all comments-install
@@ -39,7 +39,10 @@ clean-local:
 # TODO: drop 'test' target..
 test: check

-check: check-no-trailing-blanks check-unit check-regress docs-check
+check: check-no-trailing-blanks check-unit check-regress docs-check check-news
+
+check-news:
+	utils/check_news.sh

 check-unit check-regress docs-check: all

@@ -50,6 +53,7 @@ check-no-trailing-blanks:
 		grep -v lookup3 | \
 		grep -v vector_tile.pb-c | \
 		grep -v postgis/sqldefines.h | \
+		grep -v deps/ | \
 		xargs grep -n '[[:space:]]$$'

 installcheck: installcheck-base installcheck-upgrade
@@ -154,7 +158,7 @@ config.status: configure
 	./configure

 ChangeLog:
-	svn2cl --authors=authors.svn -i -o ChangeLog
+	git log --pretty --numstat --summary | git2cl > ChangeLog

 raster-post-install-check:
 	$(MAKE) -C raster post-install-check
@@ -169,13 +173,12 @@ fmt:
 commit:
 	$(MAKE) fmt && $(MAKE) clean && $(MAKE) check && svn commit

-authors.git: authors.svn
-	sed -e 's/:/ = /' authors.svn > authors.git

-svnrebase: authors.git
-	git svn rebase --authors-file authors.git
+ifeq (@PHONY_REVISION@,yes)
+.PHONY: postgis_revision.h
+endif

-postgis_svn_revision.h:
-	$(PERL) utils/svn_repo_revision.pl
+postgis_revision.h:
+	$(PERL) utils/repo_revision.pl

-.PHONY: utils liblwgeom ChangeLog raster postgis_svn_revision.h
+.PHONY: utils liblwgeom ChangeLog raster
\ No newline at end of file
--- a/NEWS
+++ b/NEWS
+PostGIS 3.0.1
+2020/02/20
+
+* Breaking Changes *
+  - #4637 svn number replaced by git hash in version output
+    (Sandro Santilli, Regina Obe, Bas Couwenberg)
+
+* New Features *
+ - #4617, Add configure switch `--without-phony-revision` (Raúl Marín)
+          Use to prevent postgis_revision.h from rebuilding
+          (when building from tar ball) and building in a gitted folder.
+
+* Bug Fixes and Enhancements *
+  - #4558, Fix oversimplification of polygon inner rings (Raúl Marín)
+  - #4588, Fix update when ST_Union(geometry) doesn't exist (Raúl Marín)
+  - #4590, Fix pg_upgrade issue with ST_LineCrossingDirection (Raúl Marín)
+  - #4599, ST_AddPoint: Accept -1 as a valid position (Raúl Marín)
+  - #4600, Improve precision of ST_TileEnvelope (Raúl Marín)
+  - #4605, Fix postgis_upgrade.pl with PostgreSQL 12 (Matti Linnanvuori)
+  - #4606, Respect user's LDFLAGS in postgis module build (Sandro Santilli)
+  - #4610, Add in logic to install postgis_tiger_geocoder from unpackaged (Regina Obe)
+  - #4581, Installing postgis_raster from unpackaged tries to use wrong schema (Regina Obe)
+  - #4596, The script to generate nation_script_load.sh is missing
+           a trailing quote (Bill Mill)
+  - #4608, PG12: Fix several bugs in the index support function (Raúl Marín)
+  - #4621, Prevent stack overflow when parsing WKB (Raúl Marín)
+  - #4626, Support pkg-config for libxml2 (Bas Couwenberg)
+  - #4632, Allow building with PostgreSQL 13 (Raúl Marín)
+  - #4570, Include raster2pgsql in windows packaging (Regina Obe)
+
+
 PostGIS 3.0.0
 2019/10/20
+
 This version requires PostgreSQL 9.5+-12 and GEOS >= 3.6+
-Additional features enabled if you are running Proj6+ and PostgreSQL 12
+Additional features enabled if you are running Proj6+, PostgreSQL 12
+and GEOS 3.8.0

 * Breaking Changes *
  - #4267, Bump minimum GEOS version to 3.6 (Regina Obe, Darafei Praliaskouski)
@@ -10,8 +43,8 @@ Additional features enabled if you are running Proj6+ and PostgreSQL 12
  - #3807, Extension library files no longer include the minor version.
           Use New configure switch --with-library-minor-version
           if you need the old behavior (Regina Obe)
-  - #4230, ND box operators (overlaps, contains, within, equals) now don't look on
-           dimensions that aren't present in both operands.
+  - #4230, ND box operators (overlaps, contains, within, equals) now
+           don't look on dimensions that aren't present in both operands.
           Please REINDEX your ND indexes after upgrade. (Darafei Praliaskouski)
  - #4229, Dropped support for PostgreSQL < 9.5. (Darafei Praliaskouski)
  - #4260, liblwgeom headers are not installed anymore.
@@ -120,180 +153,68 @@ Additional features enabled if you are running Proj6+ and PostgreSQL 12
  - #4328, ST_3DIntersects for 2D TINs. (Darafei Praliaskouski)
  - #4509, Update geocoder for tiger 2019 (Regina Obe)

-* 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)
+
+PostGIS 2.5.3
+2019/08/11
+
+ * Bug fixes *
+
+  - #4348, ST_AsMVTGeom (GEOS): Enforce validation at all times (Raúl Marín)
  - #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)
+  - #4326, Fix circular arc distance calculation (Paul Ramsey)
+  - #4380, Simple TIN support to allow viz in QGIS (Paul Ramsey)
  - #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)
-  - #4459, Fix ST_Subdivide crash on intermediate EMPTY (Darafei Praliaskouski)
-  - #4470, ST_GeomFromGeoJSON crash on empty rings (Darafei Praliaskouski)
-  - #4387, Re-enable OSS Fuzz and fuzz geojson parser (Darafei Praliaskouski)
-
-PostGIS 3.0.0rc2
-2019/10/13
-
-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
-Additional performance enhancements if running GEOS 3.8+
-
-* Major highlights *
-  - #4534, Fix leak in lwcurvepoly_from_wkb_state (Raúl Marín)
-  - #4536, Fix leak in lwcollection_from_wkb_state (Raúl Marín)
-  - #4537, Fix leak in WKT collection parser (Raúl Marín)
-  - #4535, WKB: Avoid buffer overflow (Raúl Marín)
-  - #4549, Fix schema qualification of internal types (Raúl Marín)
-  - #4546, Fix PLPGSQL functions missing the schema qualification (Raúl Marín)
-
-PostGIS 3.0.0rc1
-2019/10/08
-
-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
-Additional performance enhancements if running GEOS 3.8+
-
-* Major highlights *
-  - #4519, Fix getSRIDbySRS crash (Raúl Marín)
-  - #4520, Use a clean environment when detecting C++ libraries (Raúl Marín)
-  - Restore ST_Union() aggregate signature so drop agg not required and re-work
-    performance/size enhancement to continue to avoid
-    using Array type during ST_Union(), hopefully
-    avoiding Array size limitations. (Paul Ramsey)
-
-PostGIS 3.0.0beta1
-2019/09/28
-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
-Additional performance enhancements if running GEOS 3.8+
-
-* Major highlights *
-  - #4492, Fix ST_Simplify ignoring the value of the 3rd parameter (Raúl Marín)
-  - #4494, Fix ST_Simplify output having an outdated bbox (Raúl Marín)
-  - #4493, Fix ST_RemoveRepeatedPoints output having an outdated bbox (Raúl Marín)
-  - #4495, Fix ST_SnapToGrid output having an outdated bbox (Raúl Marín)
-  - #4496, Make ST_Simplify(TRIANGLE) collapse if requested (Raúl Marín)
-  - #4501, Allow postgis_tiger_geocoder to be installable by non-super users (Regina Obe)
-  - #4503, Speed up the calculation of cartesian bbox (Raúl Marín)
-  - #4504, shp2pgsql -D not working with schema qualified tables (Regina Obe)
-  - #4505, Speed up conversion of geometries to/from GEOS (Dan Baston)
-  - #4507, Use GEOSMakeValid and GEOSBuildArea for GEOS 3.8+ (Dan Baston)
-  - #4491, Speed up ST_RemoveRepeatedPoints (Raúl Marín)
-  - #4509, Update geocoder for tiger 2019 (Regina Obe)
-  - #4338, Census block level data (tabblock table) not loading (Regina Obe)
-
-
-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)
+  - #4440, Internal type lookups fail over FDW (Paul Ramsey)
+  - #4445, Fix bug in lwgeom_le (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)
+  - #4461, ST_AsTWKB doesn't always remove duplicate points (Nicklas Avén)
+  - #4459, Fix ST_Subdivide crash on intermediate EMPTY (Darafei Praliaskouski)
+  - #4470, ST_GeomFromGeoJSON crash on empty rings (Darafei Praliaskouski)
  - #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.
-This version requires PostgreSQL 9.5+-12 and GEOS >= 3.6+
-Additional features enabled if you are running Proj6+ and PostgreSQL 12
-
-* Major highlights *
-  - #4414, Include version number in address_standardizer lib (Raúl Marín)
-  - #4352, Use CREATE OR REPLACE AGGREGATE for PG12+ (Raúl Marín)
-  - #4334, Fix upgrade issues related to renamed 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)
-  - #4429, Avoid resource leaks with PROJ6 (Raúl Marín)
-  - #4372, PROJ6: Speed improvements (Raúl Marín)
-  - #3437, Speed up ST_Intersects with Points (Raúl Marín)
-  - #4438, Update serialization to support extended flags area (Paul Ramsey)
-  - #4443, Fix wagyu configure dropping CPPFLAGS (Raúl Marín)
-  - #4440, Type lookups in FDW fail (Paul Ramsey)
-  - #4442, raster2pgsql now skips NODATA tiles. Use -k option if you still want
-           them in database for some reason. (Darafei Praliaskouski)
-  - #4441, Make GiST penalty friendly to multi-column indexes and build single-column
-           ones faster. (Darafei Praliaskouski)
-
-PostGIS 3.0.0alpha2
-2019/06/02
-
-* Major highlights *
-  - #4404, Fix selectivity issue with support functions (Paul Ramsey)
-  - #4311, Make wagyu the default option to validate polygons.
-          This option requires a C++11 compiler and will use CXXFLAGS (not CFLAGS).
-          It only enabled if built with MVT support (protobuf)
-          Add `--without-wagyu` to disable this option and keep the behaviour
-          from 2.5 (Raúl Marín)
-  - #4198, Add ST_ConstrainedDelaunayTriangles SFCGAL function (Darafei
-           Praliaskouski)

-PostGIS 3.0.0alpha1
-2019/05/26
+PostGIS 2.5.2
+2019/03/11

-* Major highlights *
-  - #4341, Using "support function" API in PgSQL 12+ to replace SQL inlining
-           as the mechanism for providing index support under ST_Intersects, et al
-           (Paul Ramsey)
-  - #3888, Raster support now packaged as a separate extension - postgis_raster
-           (Sandro Santilli)
-  - #3807, Extension library files no longer include the minor version.
-           Use New configure switch --with-library-minor-version
-           if you need the old behavior (Regina Obe)
-  - #4322, Support for Proj 6+ API, bringing more accurate datum transforms
-           and support for WKT projections
-  - #4260, liblwgeom headers are not installed anymore.
-           If your project depends on them available, please use
-           librttopo instead. (Darafei Praliaskouski)
-  - #4311, Introduce `--with-wagyu` as an option for MVT polygons (Raúl Marín)
-  - #4258, #4278 Enhance postgis functions ST_Area, ST_Distance, ST_Intersection,
-           ST_Difference, ST_Union, ST_Intersects, ST_3DIntersects, ST_3DDistance
-           to handle types (Solid PolyhedralSurface, TINS) that were only available in SFCGAL.
-           Remove postgis.backend switch. (Darafei Praliaskouski)
-  - #4230, SP-GiST and GiST support for ND box operators overlaps, contains,
-           within, equals (Esteban Zimányi and Arthur Lesuisse from Université
-           Libre de Bruxelles (ULB), Darafei Praliaskouski)
+ * Bug fixes *

+  - #4231, Support for PostgreSQL 12dev (remove use of pg_constraint.consrc)
+           (Regina Obe, Laurenz Albe)
+  - #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.
+  WARNING: REINDEX your ND index on tables that have records with different M/Z
+           dimensions for &&& operator to work predictably.
+           (Darafei Praliaskouski, Arthur Lesuisse, Andrew Gierth, Raúl Marín)
+  - #4262, Document MULTISURFACE compatibility of ST_LineToCurve (Steven Ottens)
+  - #4267, Enable Proj 6 deprecated APIs (Darafei Praliaskouski, Raúl Marín)
+  - #4276, ST_AsGeoJSON documentation refresh (Darafei Praliaskouski)
+  - #4273, Tighter parsing of WKT (Paul Ramsey)
+  - #4292, ST_AsMVT: parse JSON numeric values with decimals as doubles (Raúl Marín)
+  - #4300, ST_AsMVTGeom: Always return the simplest geometry (Raúl Marín)
+  - #4301, ST_Subdivide: fix endless loop on coordinates near coincident to bounds
+           (Darafei Praliaskouski)
+  - #4261, Use AccessShareLock in spatial_index_read_extent (Paul Ramsey)
+  - #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)
+  - #4290, More robust geography distance (Paul Ramsey)
+  - #4283, Avoid final point duplicates for circle stroking (Paul Ramsey)
+  - #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)
+  - #4290, Schema qualify geometry casts in raster functions (Regina Obe)
+  - #4086, Constraint violation loading tiger_data (zcta5 geometry type) (Regina Obe)

 PostGIS 2.5.0
 2018/09/23
+
 WARNING: If compiling with PostgreSQL+JIT, LLVM >= 6 is required
 Supported PostgreSQL versions for this release are:
 PostgreSQL 9.4 - PostgreSQL 12 (in development)
@@ -1572,6 +1493,8 @@ PostGIS 2.0.0
  - 3D analysis functions are now named with "3D" as a prefix
    instead of a suffix (eg ST_Length3D has become ST_3DLength)
  - Operator && does not check for SRID mismatch anymore
+  - Cast function from raster to bytea now called `bytea` instead
+    of `st_bytea` (#1003)

 * New Features *


--- a/README.md
+++ b/README.md
@@ -3,14 +3,14 @@ Debbie:
 Winnie:
 [![Build Status](https://winnie.postgis.net:444/buildStatus/icon?job=PostGIS_3.0)](https://winnie.postgis.net:444/view/PostGIS/job/PostGIS_3.0/)
 Dronie:
- [![Build Status](https://dronie.osgeo.org/api/badges/postgis/postgis/status.svg?branch=svn-3.0)](https://dronie.osgeo.org/postgis/postgis?branch=svn-3.0)
+ [![Build Status](https://dronie.osgeo.org/api/badges/postgis/postgis/status.svg?branch=stable-3.0)](https://dronie.osgeo.org/postgis/postgis?branch=stable-3.0)

 Travis:
- [![Build Status](https://api.travis-ci.org/postgis/postgis.svg?branch=svn-3.0,svn-3.0,svn-2.5,svn-2.4,svn-2.3)](http://travis-ci.org/postgis/postgis)
+ [![Build Status](https://api.travis-ci.org/postgis/postgis.svg?branch=stable-3.0)](http://travis-ci.org/postgis/postgis)
 GitLab-CI:
- [![Gitlab-CI](https://gitlab.com/postgis/postgis/badges/svn-3.0/build.svg)](https://gitlab.com/postgis/postgis/commits/svn-3.0)
+ [![Gitlab-CI](https://gitlab.com/postgis/postgis/badges/stable-3.0/pipeline.svg)](https://gitlab.com/postgis/postgis/commits/stable-3.0)
 Drone.io:
- [![Build Status](https://cloud.drone.io/api/badges/postgis/postgis/status.svg?branch=svn-3.0)](https://cloud.drone.io/postgis/postgis?branch=svn-3.0)
+ [![Build Status](https://cloud.drone.io/api/badges/postgis/postgis/status.svg?branch=stable-3.0)](https://cloud.drone.io/postgis/postgis?branch=stable-3.0)


 Bessie:

--- a/README.postgis
+++ b/README.postgis
 PostGIS - Geographic Information Systems Extensions to PostgreSQL
 =================================================================

-:Version: 3.0.0
-:Date: 2019-10-20
+:Version: 3.0.1
+:Date: 2020-02-20
 :Website: https://postgis.net

 This distribution contains a module which implements GIS simple features, ties

--- a/SECURITY.md
+++ b/SECURITY.md
+# Security Policies and Procedures
+
+If you believe you have found a security vulnerability in PostGIS please report it to us following the procedure below. We appreciate your efforts to disclose the issue responsibly.
+
+## Reporting a Vulnerability
+
+To report a security issue, please email the team at [security@postgis.net](mailto:security@postgis.net), which is a private maintainer-only group. The security team will reply as soon as
+possible to acknowledge the receipt of your message and to discuss future steps or request additional information.
+
+For reporting non-security issues, please use the traditional channels and open a [Trac ticket](https://trac.osgeo.org/postgis/) or use the public mailing lists ([users](https://lists.osgeo.org/mailman/listinfo/postgis-users) and [devel](https://lists.osgeo.org/mailman/listinfo/postgis-devel).
+
+To help us better diagnose the issue, please include the following information (as much as you can provide):
+
+- Current PostGIS version: `SELECT postgis_full_version();`.
+- Current PostgreSQL version: `SELECT version();`.
+- Step by step instructions to reproduce the issue.
+
+## Procedure
+
+Upon receiving a vulnerability report, the security team will:
+
+* Confirm the vulnerability and the affected releases.
+* Verify if there are similar problems in the code.
+* Patch all releases still under maintenance and release micro versions including the fix.
+
+Please note that issues in [unsupported releases](https://trac.osgeo.org/postgis/wiki/UsersWikiPostgreSQLPostGIS) will likely not be addressed, and issues with third party dependencies need to be reported to the team maintaining them.
--- a/Version.config
+++ b/Version.config
@@ -5,7 +5,7 @@

 POSTGIS_MAJOR_VERSION=3
 POSTGIS_MINOR_VERSION=0
-POSTGIS_MICRO_VERSION=0
+POSTGIS_MICRO_VERSION=1

 # Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
 # when changing POSTGIS_MINOR_VERSION

--- a/ci/bessie/postgis_regress.sh
+++ b/ci/bessie/postgis_regress.sh
 #BRANCH is passed in via jenkins which is set via svn hook
 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

--- a/ci/debbie/postgis_release_docs.sh
+++ b/ci/debbie/postgis_release_docs.sh
@@ -38,13 +38,13 @@ LDFLAGS="-L${PGPATH}/lib"  ./configure \
  --without-raster --without-wagyu
 make clean

-# generating postgis_svn_revision.h in case hasn't been generated
-if test -f utils/svn_repo_revision.pl; then
-	echo "Generating postgis_svn_revision.h"
-	perl utils/svn_repo_revision.pl
+# generating postgis_revision.h in case hasn't been generated
+if test -f utils/repo_revision.pl; then
+	echo "Generating postgis_revision.h"
+	perl utils/repo_revision.pl
 fi
-export VREV="`cat postgis_svn_revision.h | awk '{print $3}'`"
-echo "SVN is ${VREV}"
+export VREV="`cat postgis_revision.h | awk '{print $3}'`"
+echo "GIT is ${VREV}"
 cd doc



--- a/ci/winnie/build_postgis.sh
+++ b/ci/winnie/build_postgis.sh
@@ -2,7 +2,7 @@
 set -e
 if  [[ "${OVERRIDE}" == '' ]] ; then
 	export GEOS_VER=3.8.0
-	export GDAL_VER=2.4.2
+	export GDAL_VER=2.4.3
 	export PROJ_VER=5.2.0
 	export SFCGAL_VER=1.3.2
 	export CGAL_VER=4.11

--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -17,7 +17,7 @@
 #!/bin/bash
 if  [[ "${OVERRIDE}" == '' ]] ; then
 	export GEOS_VER=3.8.0
-	export GDAL_VER=2.4.2
+	export GDAL_VER=2.4.3
 	export PROJ_VER=5.2.0
 	export SFCGAL_VER=1.3.2
 	export CGAL_VER=4.11
@@ -224,6 +224,7 @@ cp utils/*.pl ${RELDIR}/${RELVERDIR}/utils
 #cp raster/rt_pg/rtpostgis_upgrade_20_minor.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}

 cp raster/loader/.libs/raster2pgsql.exe ${RELDIR}/${RELVERDIR}/bin
+cp raster/loader/raster2pgsql.exe ${RELDIR}/${RELVERDIR}/bin
 cp liblwgeom/.libs/*.dll ${RELDIR}/${RELVERDIR}/bin
 cp loader/shp2pgsql.exe ${RELDIR}/${RELVERDIR}/bin
 cp loader/.libs/shp2pgsql.exe ${RELDIR}/${RELVERDIR}/bin
@@ -252,15 +253,20 @@ cp -r extensions/*/*.dll ${RELDIR}/${RELVERDIR}/lib #only address_standardizer i
 cp -r ${RELDIR}/packaging_notes/* ${RELDIR}/${RELVERDIR}/


-echo "GEOS VERSION: ${GEOS_VER} http://trac.osgeo.org/geos" >> $verfile
-echo "GDAL VERSION: ${GDAL_VER} http://trac.osgeo.org/gdal" >> $verfile
-echo "PROJ VERSION: ${PROJ_VER} http://trac.osgeo.org/proj" >> $verfile
+echo "GEOS VERSION: ${GEOS_VER} https://trac.osgeo.org/geos" >> $verfile
+echo "GDAL VERSION: ${GDAL_VER} https://gdal.org/download.html#current-releases" >> $verfile
+echo "PROJ VERSION: ${PROJ_VER} https://proj.org/download.html#current-release" >> $verfile

 if [ -n "$SFCGAL_VER"  ]; then
    echo "CGAL VERSION: ${CGAL_VER} http://www.cgal.org" >> $verfile
    echo "BOOST VERSION: ${BOOST_VER} http://www.boost.org" >> $verfile
    echo "SFCGAL VERSION: ${SFCGAL_VER} http://www.sfcgal.org https://github.com/Oslandia/SFCGAL" >> $verfile
 fi;
+
+if [ -f ${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/gdal_depends.txt ]; then 
+	cat $verfile ${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/gdal_depends.txt > $verfile
+fi
+
 #echo "PAGC ADDRESS STANDARDIZER: http://sourceforge.net/p/pagc/code/HEAD/tree/branches/sew-refactor/postgresql " >> $verfile
 cd ${RELDIR}
 zip -r $package ${RELVERDIR}

--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -2,7 +2,7 @@
 set -e
 if  [[ "${OVERRIDE}" == '' ]] ; then
 	export GEOS_VER=3.8.0
-	export GDAL_VER=2.4.2
+	export GDAL_VER=2.4.3
 	export PROJ_VER=5.2.0
 	export SFCGAL_VER=1.3.2
 	export CGAL_VER=4.11

--- a/configure
+++ b/configure
@@ -736,6 +736,8 @@ GEOS_LDFLAGS
 GEOSCONFIG
 POSTGIS_LIBXML2_VERSION
 XCRUN
+LIBXML2_LIBS
+LIBXML2_CFLAGS
 XML2CONFIG
 HAVE_SPGIST
 POSTGIS_PGSQL_HR_VERSION
@@ -933,6 +935,8 @@ PKG_CONFIG_LIBDIR
 CUNIT_CFLAGS
 CUNIT_LIBS
 PG_CONFIG
+LIBXML2_CFLAGS
+LIBXML2_LIBS
 PROJ_CFLAGS
 PROJ_LIBS
 JSONC_CFLAGS
@@ -1661,6 +1665,10 @@ Some influential environment variables:
  CUNIT_LIBS  linker flags for CUNIT, overriding pkg-config
  PG_CONFIG   PostgreSQL configure command to determine Postgres version to
              build against.
+  LIBXML2_CFLAGS
+              C compiler flags for LIBXML2, overriding pkg-config
+  LIBXML2_LIBS
+              linker flags for LIBXML2, overriding pkg-config
  PROJ_CFLAGS C compiler flags for PROJ, overriding pkg-config
  PROJ_LIBS   linker flags for PROJ, overriding pkg-config
  JSONC_CFLAGS
@@ -13693,10 +13701,7 @@ if test "x$MATHML2_DTD" = "x"; then
 fi
  
  
-
-CUNIT_CPPFLAGS=""
-CUNIT_LDFLAGS=""
-if test ! -z "$PKG_CONFIG"; then
+# check for pkg-config
  
  
  
@@ -13817,6 +13822,16 @@ $as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
 fi
+if test -z "$PKG_CONFIG"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find pkg-config, make sure it is installed in your PATH" >&5
+$as_echo "$as_me: WARNING: Cannot find pkg-config, make sure it is installed in your PATH" >&2;}
+fi
+
+
+
+CUNIT_CPPFLAGS=""
+CUNIT_LDFLAGS=""
+if test ! -z "$PKG_CONFIG"; then
  
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CUNIT" >&5
@@ -14414,6 +14429,9 @@ else
 fi
  
  
+XML2_LDFLAGS=""
+XML2_CPPFLAGS=""
+
 if test "x$XML2CONFIG" = "x"; then
 		# Extract the first word of "xml2-config", so it can be a program name with args.
 set dummy xml2-config; ac_word=$2
@@ -14457,8 +14475,111 @@ fi
  
  
 		if test "x$XML2CONFIG" = "x"; then
+		if test ! -z "$PKG_CONFIG"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBXML2" >&5
+$as_echo_n "checking for LIBXML2... " >&6; }
+
+if test -n "$LIBXML2_CFLAGS"; then
+    pkg_cv_LIBXML2_CFLAGS="$LIBXML2_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBXML2_LIBS"; then
+    pkg_cv_LIBXML2_LIBS="$LIBXML2_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0" 2>&1`
+        else
+	        LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBXML2_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (libxml-2.0) were not met:
+
+$LIBXML2_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables LIBXML2_CFLAGS
+and LIBXML2_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables LIBXML2_CFLAGS
+and LIBXML2_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS
+	LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+				XML2_CPPFLAGS="$LIBXML2_CFLAGS"
+				XML2_LDFLAGS="$LIBXML2_LIBS"
+				POSTGIS_LIBXML2_VERSION=`$PKG_CONFIG libxml-2.0 --modversion`
+
+fi
+		else
 			as_fn_error $? "could not find xml2-config from libxml2 within the current path. You may need to try re-running configure with a --with-xml2config parameter." "$LINENO" 5
 		fi
+	else
+				XML2_LDFLAGS=`$XML2CONFIG --libs`
+		XML2_CPPFLAGS=`$XML2CONFIG --cflags`
+
+				POSTGIS_LIBXML2_VERSION=`$XML2CONFIG --version`
+	fi
 else
 		if test "x$XML2CONFIG" = "xyes"; then
 		as_fn_error $? "you must specify a parameter to --with-xml2config, e.g. --with-xml2config=/path/to/xml2-config" "$LINENO" 5
@@ -14466,6 +14587,11 @@ else
 		if test -f $XML2CONFIG; then
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using user-specified xml2-config file: $XML2CONFIG" >&5
 $as_echo "Using user-specified xml2-config file: $XML2CONFIG" >&6; }
+
+						XML2_LDFLAGS=`$XML2CONFIG --libs`
+			XML2_CPPFLAGS=`$XML2CONFIG --cflags`
+
+						POSTGIS_LIBXML2_VERSION=`$XML2CONFIG --version`
 		else
 			as_fn_error $? "the user-specified xml2-config file $XML2CONFIG does not exist" "$LINENO" 5
 		fi
@@ -14473,10 +14599,6 @@ $as_echo "Using user-specified xml2-config file: $XML2CONFIG" >&6; }
 fi
  
  
-XML2_LDFLAGS=`$XML2CONFIG --libs`
-XML2_CPPFLAGS=`$XML2CONFIG --cflags`
-
-
 case $host_os in
    darwin*)
        # Extract the first word of "xcrun", so it can be a program name with args.
@@ -14536,9 +14658,6 @@ $as_echo "using OSX XCode $XCODE_VER... yes" >&6; }
        ;;
 esac
  
-
-POSTGIS_LIBXML2_VERSION=`$XML2CONFIG --version`
-
 CPPFLAGS_SAVE="$CPPFLAGS"
 CPPFLAGS="$XML2_CPPFLAGS"
 for ac_header in libxml/tree.h libxml/parser.h libxml/xpath.h libxml/xpathInternals.h
@@ -16903,133 +17022,6 @@ LDFLAGS="$LDFLAGS_SAVE"
 CFLAGS="$CFLAGS_SAVE"
  
  
-# check for pkg-config
-
-
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; 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_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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_PKG_CONFIG="$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
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; 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_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # 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_ac_pt_PKG_CONFIG="$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
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		PKG_CONFIG=""
-	fi
-fi
-if test -z "$PKG_CONFIG"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find pkg-config, make sure it is installed in your PATH" >&5
-$as_echo "$as_me: WARNING: Cannot find pkg-config, make sure it is installed in your PATH" >&2;}
-fi
-
-
  
  
 # Check whether --with-projdir was given.

--- a/configure.ac
+++ b/configure.ac
@@ -307,6 +307,16 @@ if test "x$MATHML2_DTD" = "x"; then
 fi
 AC_SUBST([MATHML2_DTD])

+dnl ===========================================================================
+dnl Detect if pkg-config installed
+dnl ===========================================================================
+# check for pkg-config
+PKG_PROG_PKG_CONFIG
+if test -z "$PKG_CONFIG"; then
+   AC_MSG_WARN([Cannot find pkg-config, make sure it is installed in your PATH])
+fi
+
+
 dnl ===========================================================================
 dnl Detect CUnit if it is installed (used for unit testing)
 dnl
@@ -584,14 +594,32 @@ AC_ARG_WITH([xml2config],
 	[AS_HELP_STRING([--with-xml2config=FILE], [specify an alternative xml2-config file])],
 	[XML2CONFIG="$withval"], [XML2CONFIG=""])

+XML2_LDFLAGS=""
+XML2_CPPFLAGS=""
+
 if test "x$XML2CONFIG" = "x"; then
 	dnl XML2CONFIG was not specified, so search within the current path
 	AC_PATH_PROG([XML2CONFIG], [xml2-config])

-	dnl If we couldn't find xml2-config, display a warning
+	dnl If we couldn't find xml2-config, display a warning if pkg-config fails too
 	if test "x$XML2CONFIG" = "x"; then
+		if test ! -z "$PKG_CONFIG"; then
+			PKG_CHECK_MODULES([LIBXML2], [libxml-2.0], [
+				XML2_CPPFLAGS="$LIBXML2_CFLAGS"
+				XML2_LDFLAGS="$LIBXML2_LIBS"
+				POSTGIS_LIBXML2_VERSION=`$PKG_CONFIG libxml-2.0 --modversion`
+			], [])
+		else
 			AC_MSG_ERROR([could not find xml2-config from libxml2 within the current path. You may need to try re-running configure with a --with-xml2config parameter.])
 		fi
+	else
+		dnl Extract the linker and include flags
+		XML2_LDFLAGS=`$XML2CONFIG --libs`
+		XML2_CPPFLAGS=`$XML2CONFIG --cflags`
+
+		dnl Extract the version
+		POSTGIS_LIBXML2_VERSION=`$XML2CONFIG --version`
+	fi
 else
 	dnl XML2CONFIG was specified; display a message to the user
 	if test "x$XML2CONFIG" = "xyes"; then
@@ -599,6 +627,13 @@ else
 	else
 		if test -f $XML2CONFIG; then
 			AC_MSG_RESULT([Using user-specified xml2-config file: $XML2CONFIG])
+
+			dnl Extract the linker and include flags
+			XML2_LDFLAGS=`$XML2CONFIG --libs`
+			XML2_CPPFLAGS=`$XML2CONFIG --cflags`
+
+			dnl Extract the version
+			POSTGIS_LIBXML2_VERSION=`$XML2CONFIG --version`
 		else
 			AC_MSG_ERROR([the user-specified xml2-config file $XML2CONFIG does not exist])
 		fi
@@ -606,11 +641,6 @@ else
 fi


-dnl Extract the linker and include flags
-XML2_LDFLAGS=`$XML2CONFIG --libs`
-XML2_CPPFLAGS=`$XML2CONFIG --cflags`
-
-
 dnl
 dnl XCode in 10.12 supplies bad flags in xml2config resulting
 dnl in compile errors. For that one version, we force the prefix
@@ -633,10 +663,6 @@ case $host_os in
        ;;
 esac

-
-dnl Extract the version
-POSTGIS_LIBXML2_VERSION=`$XML2CONFIG --version`
-
 dnl Check headers file
 CPPFLAGS_SAVE="$CPPFLAGS"
 CPPFLAGS="$XML2_CPPFLAGS"
@@ -824,16 +850,6 @@ LDFLAGS="$LDFLAGS_SAVE"
 CFLAGS="$CFLAGS_SAVE"


-dnl ===========================================================================
-dnl Detect if pkg-config installed
-dnl ===========================================================================
-# check for pkg-config
-PKG_PROG_PKG_CONFIG
-if test -z "$PKG_CONFIG"; then
-   AC_MSG_WARN([Cannot find pkg-config, make sure it is installed in your PATH])
-fi
-
-
 dnl ===========================================================================
 dnl Detect the version of PROJ.4 installed
 dnl ===========================================================================

--- a/debian/changelog
+++ b/debian/changelog
-postgis (3.0.0+dfsg-7) UNRELEASED; urgency=medium
+postgis (3.0.1+dfsg-1) unstable; urgency=medium

+  * New upstream release.
+    (closes: #949426)
  * Don't hardcode test exit status for failures.
  * Don't bother with autopkgtest on problematic architectures.
    (closes: #949026)
  * Update update metadata for move to git.
-  * Add patch to use pkg-config for libxml2.
-    (closes: #949426)
  * Bump Standards-Version to 4.5.0, no changes.
+  * Update watch file for 3.0.x. releases.
+  * Update upstream branch in gbp.conf.
+  * Disable automatic updates of postgis_revision.h.

- -- Bas Couwenberg <sebastic@debian.org>  Thu, 16 Jan 2020 10:16:23 +0100
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 23 Feb 2020 07:59:09 +0100

 postgis (3.0.0+dfsg-6) unstable; urgency=medium


--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -2,7 +2,7 @@

 # The default name for the upstream branch is "upstream".
 # Change it if the name is different (for instance, "master").
-upstream-branch = upstream
+upstream-branch = upstream-3.0

 # The default name for the Debian branch is "master".
 # Change it if the name is different (for instance, "debian/unstable").

--- a/debian/patches/libxml2.patch
+++ b/debian/patches/libxml2.patch
-Description: Use pkg-config for libxml2.
-Author: Bas Couwenberg <sebastic@debian.org>
-Bug: https://trac.osgeo.org/postgis/ticket/4626
-Bug-Debian: https://bugs.debian.org/949426
-Forwarded: https://trac.osgeo.org/postgis/attachment/ticket/4626/libxml2.patch
-Applied-Upstream: https://trac.osgeo.org/postgis/changeset/8033b2844f14708e84ea9ae29e3129a03e457bd0/git
-
--- a/configure.ac
-+++ b/configure.ac
-@@ -308,6 +308,16 @@ fi
- AC_SUBST([MATHML2_DTD])
- 
- dnl ===========================================================================
-+dnl Detect if pkg-config installed
-+dnl ===========================================================================
-+# check for pkg-config
-+PKG_PROG_PKG_CONFIG
-+if test -z "$PKG_CONFIG"; then
-+   AC_MSG_WARN([Cannot find pkg-config, make sure it is installed in your PATH])
-+fi
-+
-+
-+dnl ===========================================================================
- dnl Detect CUnit if it is installed (used for unit testing)
- dnl
- dnl Note that we pass any specified CPPFLAGS and LDFLAGS into the Makefile
-@@ -584,13 +594,32 @@ AC_ARG_WITH([xml2config],
- 	[AS_HELP_STRING([--with-xml2config=FILE], [specify an alternative xml2-config file])],
- 	[XML2CONFIG="$withval"], [XML2CONFIG=""])
- 
-+XML2_LDFLAGS=""
-+XML2_CPPFLAGS=""
-+
- if test "x$XML2CONFIG" = "x"; then
- 	dnl XML2CONFIG was not specified, so search within the current path
- 	AC_PATH_PROG([XML2CONFIG], [xml2-config])
- 
-	dnl If we couldn't find xml2-config, display a warning
-+	dnl If we couldn't find xml2-config, display a warning if pkg-config fails too
- 	if test "x$XML2CONFIG" = "x"; then
-		AC_MSG_ERROR([could not find xml2-config from libxml2 within the current path. You may need to try re-running configure with a --with-xml2config parameter.])
-+		if test ! -z "$PKG_CONFIG"; then
-+			PKG_CHECK_MODULES([LIBXML2], [libxml-2.0], [
-+				XML2_CPPFLAGS="$LIBXML2_CFLAGS"
-+				XML2_LDFLAGS="$LIBXML2_LIBS"
-+				HAVE_LIBXML2="1"
-+				POSTGIS_LIBXML2_VERSION=`$PKG_CONFIG libxml-2.0 --modversion`
-+			], [])
-+		else
-+			AC_MSG_ERROR([could not find xml2-config from libxml2 within the current path. You may need to try re-running configure with a --with-xml2config parameter.])
-+		fi
-+	else
-+		dnl Extract the linker and include flags
-+		XML2_LDFLAGS=`$XML2CONFIG --libs`
-+		XML2_CPPFLAGS=`$XML2CONFIG --cflags`
-+
-+		dnl Extract the version
-+		POSTGIS_LIBXML2_VERSION=`$XML2CONFIG --version`
- 	fi
- else
- 	dnl XML2CONFIG was specified; display a message to the user
-@@ -599,6 +628,13 @@ else
- 	else
- 		if test -f $XML2CONFIG; then
- 			AC_MSG_RESULT([Using user-specified xml2-config file: $XML2CONFIG])
-+
-+			dnl Extract the linker and include flags
-+			XML2_LDFLAGS=`$XML2CONFIG --libs`
-+			XML2_CPPFLAGS=`$XML2CONFIG --cflags`
-+
-+			dnl Extract the version
-+			POSTGIS_LIBXML2_VERSION=`$XML2CONFIG --version`
- 		else
- 			AC_MSG_ERROR([the user-specified xml2-config file $XML2CONFIG does not exist])
- 		fi
-@@ -606,11 +642,6 @@ else
- fi
- 
- 
-dnl Extract the linker and include flags
-XML2_LDFLAGS=`$XML2CONFIG --libs`
-XML2_CPPFLAGS=`$XML2CONFIG --cflags`
-
-
- dnl
- dnl XCode in 10.12 supplies bad flags in xml2config resulting
- dnl in compile errors. For that one version, we force the prefix
-@@ -633,10 +664,6 @@ case $host_os in
-         ;;
- esac
- 
-
-dnl Extract the version
-POSTGIS_LIBXML2_VERSION=`$XML2CONFIG --version`
-
- dnl Check headers file
- CPPFLAGS_SAVE="$CPPFLAGS"
- CPPFLAGS="$XML2_CPPFLAGS"
-@@ -825,16 +852,6 @@ CFLAGS="$CFLAGS_SAVE"
- 
- 
- dnl ===========================================================================
-dnl Detect if pkg-config installed
-dnl ===========================================================================
-# check for pkg-config
-PKG_PROG_PKG_CONFIG
-if test -z "$PKG_CONFIG"; then
-   AC_MSG_WARN([Cannot find pkg-config, make sure it is installed in your PATH])
-fi
-
-
-dnl ===========================================================================
- dnl Detect the version of PROJ.4 installed
- dnl ===========================================================================
- 
--- a/debian/patches/series
+++ b/debian/patches/series
 relax-test-timing-constraints.patch
 chaikin
-libxml2.patch
--- a/debian/rules
+++ b/debian/rules
@@ -72,6 +72,7 @@ COMMON_CONFIGURE_ARGS = --host=$(DEB_HOST_GNU_TYPE) \
 	--mandir=\$${prefix}/share/man \
 	--infodir=\$${prefix}/share/info \
 	--without-interrupt-tests \
+	--without-phony-revision \
 	--with-gui

 NJOBS := -j1