debian/changelog

+postgis (3.0.0+dfsg-6) UNRELEASED; urgency=medium
+
+  * Revert postgresql-11 change in control file.
+  * Re-enable SFCGAL support.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 08 Dec 2019 18:06:55 +0100
+
 postgis (3.0.0+dfsg-5) unstable; urgency=medium
 
   * Disable SFCGAL support in regress autopkgtest too.

debian/control

@@ -26,6 +26,7 @@ Build-Depends: autoconf2.13,
                libjson-c-dev | libjson0-dev (>= 0.9~),
                libproj-dev (>= 4.6.0),
                libprotobuf-c-dev,
+               libsfcgal-dev (>= 1.3.1) [!armel !armhf],
                libxml2-dev (>= 2.5.0~),
                lsb-release,
                po-debconf,
@@ -44,7 +45,7 @@ Package: postgis
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Recommends: postgresql-11-postgis-3,
+Recommends: postgresql-12-postgis-3,
             postgis-doc
 Suggests: postgis-gui
 Description: Geographic objects support for PostgreSQL
@@ -62,7 +63,7 @@ Package: postgis-gui
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Recommends: postgresql-11-postgis-3,
+Recommends: postgresql-12-postgis-3,
             postgis-doc
 Suggests: postgis
 Breaks: postgis (<< 2.2.2+dfsg-2~)
@@ -94,17 +95,17 @@ Description: Geographic objects support for PostgreSQL -- documentation
  .
  This package contains the PostGIS documentation.
 
-Package: postgresql-11-postgis-3
+Package: postgresql-12-postgis-3
 Architecture: any
-Depends: postgresql-11,
-         postgresql-11-postgis-3-scripts,
+Depends: postgresql-12,
+         postgresql-12-postgis-3-scripts,
          ${shlibs:Depends},
          ${misc:Depends}
 Suggests: postgis
 Breaks: postgis (<< 1.2.1)
-Provides: postgresql-11-postgis,
+Provides: postgresql-12-postgis,
           postgresql-postgis
-Description: Geographic objects support for PostgreSQL 11
+Description: Geographic objects support for PostgreSQL 12
  PostGIS adds support for geographic objects to the PostgreSQL
  object-relational database. In effect, PostGIS "spatially enables"
  the PostgreSQL server, allowing it to be used as a backend spatial
@@ -112,19 +113,19 @@ Description: Geographic objects support for PostgreSQL 11
  SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
  "Simple Features Specification for SQL".
  .
- To create the PostGIS extensions in a PostgreSQL 11 database, the
- postgresql-11-postgis-3-scripts package must be installed as well.
+ To create the PostGIS extensions in a PostgreSQL 12 database, the
+ postgresql-12-postgis-3-scripts package must be installed as well.
 
-Package: postgresql-11-postgis-3-scripts
+Package: postgresql-12-postgis-3-scripts
 Architecture: all
 Multi-Arch: foreign
 Depends: ${perl:Depends},
          ${misc:Depends}
-Recommends: postgresql-11-postgis-3
-Provides: postgresql-11-postgis-scripts,
+Recommends: postgresql-12-postgis-3
+Provides: postgresql-12-postgis-scripts,
           postgresql-postgis-scripts
-Replaces: postgresql-11-postgis-scripts (<< 2.2.2+dfsg-3~)
-Description: Geographic objects support for PostgreSQL 11 -- SQL scripts
+Replaces: postgresql-12-postgis-scripts (<< 2.2.2+dfsg-3~)
+Description: Geographic objects support for PostgreSQL 12 -- SQL scripts
  PostGIS adds support for geographic objects to the PostgreSQL
  object-relational database. In effect, PostGIS "spatially enables"
  the PostgreSQL server, allowing it to be used as a backend spatial
@@ -133,5 +134,5 @@ Description: Geographic objects support for PostgreSQL 11 -- SQL scripts
  "Simple Features Specification for SQL".
  .
  This package contains the SQL scripts for installing PostGIS in a PostgreSQL
- 11 database, and for upgrading from earlier PostGIS versions.
+ 12 database, and for upgrading from earlier PostGIS versions.
 

debian/control.in

@@ -26,6 +26,7 @@ Build-Depends: autoconf2.13,
                libjson-c-dev | libjson0-dev (>= 0.9~),
                libproj-dev (>= 4.6.0),
                libprotobuf-c-dev,
+               libsfcgal-dev (>= 1.3.1) [!armel !armhf],
                libxml2-dev (>= 2.5.0~),
                lsb-release,
                po-debconf,

debian/tests/regress

@@ -26,5 +26,6 @@ for v in $(pg_buildext supported-versions); do
   pg_virtualenv -v $v <<-EOF
 	set -eux
 	make -C regress/core -f Makefile.in check PERL=perl RUNTESTFLAGS="--extension --verbose" POSTGIS_GEOS_VERSION=$POSTGIS_GEOS_VERSION
+	make -C regress/sfcgal -f Makefile.in check PERL=perl RUNTESTFLAGS="--extension --verbose" HAVE_SFCGAL=yes
 	EOF
 done

debian/tests/test-extension-creation

@@ -5,7 +5,7 @@ set -eu
 for v in $(pg_buildext supported-versions); do
 	pg_virtualenv -v $v sh -e <<-'EOF'
 	# test extension (fuzzystrmatch is part of postgresql-contrib and is needed by postgis_tiger_geocoder)
-	for ext in postgis postgis_raster fuzzystrmatch postgis_tiger_geocoder postgis_topology address_standardizer address_standardizer_data_us; do
+	for ext in postgis postgis_raster postgis_sfcgal fuzzystrmatch postgis_tiger_geocoder postgis_topology address_standardizer address_standardizer_data_us; do
 		psql -eXc "CREATE EXTENSION $ext"
 	done
 	EOF