[Git][debian-gis-team/postgis][master] 3 commits: 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:
6e84c30b by Bas Couwenberg at 2018-04-06T16:40:49+02:00
Re-enable SFCGAL support, FTBFS with CGAL 4.11 is fixed.

- - - - -
c317a7e5 by Bas Couwenberg at 2018-04-11T12:01:24+02:00
Drop unnecessary get-orig-source target from rules file.

- - - - -
830cbd80 by Bas Couwenberg at 2018-04-11T12:02:16+02:00
Bump Standards-Version to 4.1.4, changes: get-orig-source target.

- - - - -


6 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 06 Apr 2018 16:39:56 +0200
+
 postgis (2.4.4+dfsg-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
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,
@@ -33,7 +33,7 @@ Build-Depends: autoconf2.13,
                protobuf-c-compiler,
                rdfind,
                xsltproc
-Standards-Version: 4.1.3
+Standards-Version: 4.1.4
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/postgis
 Vcs-Git: https://salsa.debian.org/debian-gis-team/postgis.git
 Homepage: http://postgis.net/


=====================================
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,
@@ -33,7 +33,7 @@ Build-Depends: autoconf2.13,
                protobuf-c-compiler,
                rdfind,
                xsltproc
-Standards-Version: 4.1.3
+Standards-Version: 4.1.4
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/postgis
 Vcs-Git: https://salsa.debian.org/debian-gis-team/postgis.git
 Homepage: http://postgis.net/


=====================================
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/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -315,7 +315,4 @@ override_dh_install-arch:
 override_dh_makeshlibs:
 	dh_makeshlibs -Xusr/lib/postgis -- -v$(UPSTREAM_VERSION)
 
-get-orig-source:
-	uscan --verbose --force-download
-
 .PHONY: debian/control


=====================================
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 fuzzystrmatch postgis_tiger_geocoder postgis_topology address_standardizer address_standardizer_data_us; do
+	for ext in postgis postgis_sfcgal 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/compare/a6762fd0ef38617d5f6a27cf03b831160f11f288...830cbd8091b7e6dc11939b7b2eeeeb016e7e8dc2

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/compare/a6762fd0ef38617d5f6a27cf03b831160f11f288...830cbd8091b7e6dc11939b7b2eeeeb016e7e8dc2
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/20180501/6653b031/attachment-0001.html>