[Git][debian-gis-team/merkaartor][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 / merkaartor


Commits:
ae49b549 by Bas Couwenberg at 2019-04-13T15:50:01Z
Define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H for PROJ 6.0.0 compatibility.

- - - - -
41e14bd3 by Bas Couwenberg at 2019-04-13T16:03:34Z
Update spelling errors patch to fix additional issues.

- - - - -


3 changed files:

- debian/changelog
- debian/patches/spelling-errors.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -2,6 +2,8 @@ merkaartor (0.18.3+ds-6) UNRELEASED; urgency=medium
 
   * Bump Standards-Version to 4.3.0, no changes.
   * Update watch file to limit matches to archive path.
+  * Define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H for PROJ 6.0.0 compatibility.
+  * Update spelling errors patch to fix additional issues.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 05 Aug 2018 20:29:30 +0200
 


=====================================
debian/patches/spelling-errors.patch
=====================================
@@ -1,9 +1,19 @@
 Description: Fix spelling errors.
  * everytime -> every time
+ * neede     -> needed
 Author: Bas Couwenberg <sebastic at debian.org>
 
 --- a/CHANGELOG
 +++ b/CHANGELOG
+@@ -235,7 +235,7 @@ v0.17
+     * ADD : Add a "Properties" dialog to display various info about the current document
+     * ADD : Save projection in .MDC files
+     * CHG : Do not save the projection in preferences unless the projection is specified thru the menu
+-    * ADD : Re-introduce PROJ4 as a build-time optional dependency for projections. It is probably neede for exotic projections...
++    * ADD : Re-introduce PROJ4 as a build-time optional dependency for projections. It is probably needed for exotic projections...
+     * FIX : implement new Id's as global incremented 64-bits integer (fixes #3082)
+     * FIX : lat/lon grid fixes for non-othogonal projections
+     * FIX : for non-rthogonal projections, maximize the viewport in lat/lon
 @@ -717,7 +717,7 @@ v0.11
      * FIX : upload order when merging nodes
      * FIX : warn when using wrong credentials


=====================================
debian/rules
=====================================
@@ -6,6 +6,10 @@
 # Enable hardening build flags
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+# Workaround for proj_api.h deprecation in PROJ 6.0.0
+export DEB_CFLAGS_MAINT_APPEND=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+export DEB_CXXFLAGS_MAINT_APPEND=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+
 # Use Qt5
 export QT_SELECT=5
 



View it on GitLab: https://salsa.debian.org/debian-gis-team/merkaartor/compare/25390e9002a908c932ffce3f718a2f55f3241e3c...41e14bd331464d10d5205cd675176f1cbbb73088

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/merkaartor/compare/25390e9002a908c932ffce3f718a2f55f3241e3c...41e14bd331464d10d5205cd675176f1cbbb73088
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/20190413/60113c9c/attachment-0001.html>