[Git][debian-gis-team/gdal][experimental] 2 commits: Don't set value for ACCEPT_USE_OF_DEPRECATED_PROJ_API_H flag.

[Bas Couwenberg]

Bas Couwenberg pushed to branch experimental at Debian GIS Project / gdal


Commits:
75e6fc83 by Bas Couwenberg at 2019-04-13T09:34:18Z
Don't set value for ACCEPT_USE_OF_DEPRECATED_PROJ_API_H flag.

- - - - -
81f2f588 by Bas Couwenberg at 2019-04-13T11:12:15Z
Update ogdi (build) dependencies for 4.0.0.

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+gdal (2.4.1+dfsg-1~exp2) UNRELEASED; urgency=medium
+
+  * Don't set value for ACCEPT_USE_OF_DEPRECATED_PROJ_API_H flag.
+  * Update ogdi (build) dependencies for 4.0.0.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 13 Apr 2019 11:34:03 +0200
+
 gdal (2.4.1+dfsg-1~exp1) experimental; urgency=medium
 
   * New upstream release.


=====================================
debian/control
=====================================
@@ -34,7 +34,7 @@ Build-Depends: debhelper (>= 9.20160114),
                libmodern-perl-perl,
        default-libmysqlclient-dev,
                libnetcdf-dev (>= 1:4.0.0),
-               libogdi3.2-dev,
+               libogdi-dev,
                libopenjp2-7-dev,
                libpcre3-dev,
                libpng-dev,
@@ -121,7 +121,7 @@ Depends: libgdal20 (= ${binary:Version}),
          liblzma-dev,
  default-libmysqlclient-dev,
          libnetcdf-dev,
-         libogdi3.2-dev,
+         libogdi-dev,
          libopenjp2-7-dev,
          libpcre3-dev,
          libpng-dev,


=====================================
debian/rules
=====================================
@@ -12,7 +12,7 @@
 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=1
+export DEB_CFLAGS_MAINT_APPEND=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
 
 # Disable PIE on Ubuntu where it's still problematic
 VENDOR_DERIVES_FROM_UBUNTU ?= $(shell dpkg-vendor --derives-from Ubuntu && echo yes)



View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/compare/bac9c0979ec608271a84f681ed60d86bfce3250c...81f2f58813d87d45edd2761b7c5858fcb40309dd

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/compare/bac9c0979ec608271a84f681ed60d86bfce3250c...81f2f58813d87d45edd2761b7c5858fcb40309dd
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/6c04a456/attachment-0001.html>