[Git][debian-gis-team/python-cartopy][master] 2 commits: Define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H for PROJ 6.0.0 compatibility.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / python-cartopy


Commits:
5dd8b7a9 by Bas Couwenberg at 2019-04-13T14:19:49Z
Define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H for PROJ 6.0.0 compatibility.

- - - - -
cf21b147 by Bas Couwenberg at 2019-05-26T19:35:57Z
Update dh_install override to use --list-missing.

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -9,6 +9,8 @@ python-cartopy (0.17.0+dfsg-4) UNRELEASED; urgency=medium
   [ Bas Couwenberg ]
   * Sort & align links.
   * Remove package name from lintian overrides.
+  * Define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H for PROJ 6.0.0 compatibility.
+  * Update dh_install override to use --list-missing.
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 10 Feb 2019 08:40:13 +0000
 


=====================================
debian/rules
=====================================
@@ -5,6 +5,9 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
 
+# Workaround for proj_api.h deprecation in PROJ 6.0.0
+export DEB_CFLAGS_MAINT_APPEND=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+
 export PYBUILD_NAME = cartopy
 export PYBUILD_INSTALL_ARGS = --install-data=/usr/share/cartopy
 export PYBUILD_TEST_PYTEST = 1
@@ -33,7 +36,7 @@ override_dh_auto_install:
 	$(RM) -r debian/python3-cartopy/usr/lib/python3*/dist-packages/cartopy/tests/mpl/baseline_images
 
 override_dh_install:
-	dh_install
+	dh_install --list-missing
 
 	# Remove documentation outside usr/share/doc
 	$(RM) debian/*/usr/share/cartopy/data/shapefiles/gshhs/README.TXT



View it on GitLab: https://salsa.debian.org/debian-gis-team/python-cartopy/compare/b2e14d2857c9305d02b4bb830dd939ed86d1f420...cf21b1470a656f80cc0a9097e4a7cb73d50c8014

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-cartopy/compare/b2e14d2857c9305d02b4bb830dd939ed86d1f420...cf21b1470a656f80cc0a9097e4a7cb73d50c8014
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/20190527/4a6db8e8/attachment-0001.html>