[Git][debian-gis-team/postgis][master] Revert "Re-enable SFCGAL support, FTBFS with CGAL 4.11 is fixed."

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / postgis


Commits:
6fc0103f by Bas Couwenberg at 2018-05-07T22:31:14+02:00
Revert "Re-enable SFCGAL support, FTBFS with CGAL 4.11 is fixed."

This reverts commit 6e84c30b6d71febd50425435d4b89b7635ea1c18.

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/control.in
- debian/liblwgeom-2.4-0.symbols
- debian/tests/test-extension-creation


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 postgis (2.4.4+dfsg-2) UNRELEASED; urgency=medium
 
-  * Re-enable SFCGAL support, FTBFS with CGAL 4.11 is fixed.
   * Drop unnecessary get-orig-source target from rules file.
   * Bump Standards-Version to 4.1.4, changes: get-orig-source target.
   * Enable parallel builds.


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends: autoconf2.13,
                libjson-c-dev | libjson0-dev (>= 0.9~),
                libproj-dev (>= 4.6.0),
                libprotobuf-c-dev,
-               libsfcgal-dev [!armel],
+#               libsfcgal-dev [!armel],
                libxml2-dev (>= 2.5.0~),
                po-debconf,
                postgresql-all,


=====================================
debian/control.in
=====================================
--- a/debian/control.in
+++ b/debian/control.in
@@ -24,7 +24,7 @@ Build-Depends: autoconf2.13,
                libjson-c-dev | libjson0-dev (>= 0.9~),
                libproj-dev (>= 4.6.0),
                libprotobuf-c-dev,
-               libsfcgal-dev [!armel],
+#               libsfcgal-dev [!armel],
                libxml2-dev (>= 2.5.0~),
                po-debconf,
                postgresql-all,


=====================================
debian/liblwgeom-2.4-0.symbols
=====================================
--- a/debian/liblwgeom-2.4-0.symbols
+++ b/debian/liblwgeom-2.4-0.symbols
@@ -2,11 +2,11 @@ liblwgeom-2.4.so.0 #PACKAGE# #MINVER#
  GBOX2GEOS at Base 2.2.0
  GEOS2LWGEOM at Base 2.0.0
  LWGEOM2GEOS at Base 2.0.0
- (arch=!armel)LWGEOM2SFCGAL at Base 2.2.0
+# (arch=!armel)LWGEOM2SFCGAL at Base 2.2.0
  LWGEOM_GEOS_buildArea at Base 2.0.0
  LWGEOM_GEOS_getPointN at Base 2.0.0
  MULTITYPE at Base 2.1.5
- (arch=!armel)SFCGAL2LWGEOM at Base 2.2.0
+# (arch=!armel)SFCGAL2LWGEOM at Base 2.2.0
  UF_create at Base 2.2.0
  UF_destroy at Base 2.2.0
  UF_find at Base 2.2.0
@@ -437,8 +437,8 @@ liblwgeom-2.4.so.0 #PACKAGE# #MINVER#
  lwgeom_set_geodetic at Base 2.0.0
  lwgeom_set_handlers at Base 2.1.0
  lwgeom_set_srid at Base 2.0.0
- (arch=!armel)lwgeom_sfcgal_noop at Base 2.2.0
- (arch=!armel)lwgeom_sfcgal_version at Base 2.2.0
+# (arch=!armel)lwgeom_sfcgal_noop at Base 2.2.0
+# (arch=!armel)lwgeom_sfcgal_version at Base 2.2.0
  lwgeom_sharedpaths at Base 2.0.0
  lwgeom_simplify at Base 2.0.0
  lwgeom_snap at Base 2.0.0


=====================================
debian/tests/test-extension-creation
=====================================
--- a/debian/tests/test-extension-creation
+++ b/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
-	for ext in postgis postgis_sfcgal fuzzystrmatch postgis_tiger_geocoder postgis_topology address_standardizer address_standardizer_data_us; do
+	for ext in postgis fuzzystrmatch postgis_tiger_geocoder postgis_topology address_standardizer address_standardizer_data_us; do
 		psql -eXc "CREATE EXTENSION $ext"
 	done
 	EOF



View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/commit/6fc0103fc3a89a88bf134f21b0b3f43addc269f3

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/commit/6fc0103fc3a89a88bf134f21b0b3f43addc269f3
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180601/e5daf7ea/attachment-0001.html>