debian/changelog

 gdal (2.4.0+dfsg-2) UNRELEASED; urgency=medium
 
   * Add -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 to CFLAGS for PROJ 6.0.0.
+  * Update ogdi (build) dependencies for 4.0.0.
+  * Drop package name from lintian overrides.
+  * Add lintian overrides for file-references-package-build-path.
 
  -- Bas Couwenberg <sebastic@debian.org>  Tue, 12 Mar 2019 21:18:31 +0100
 

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/gdal-bin.lintian-overrides

 # Man pages are automatically generated with sphinx.
-gdal-bin: hyphen-used-as-minus-sign
-gdal-bin: manpage-has-errors-from-man
-gdal-bin: binary-without-manpage
+hyphen-used-as-minus-sign
+manpage-has-errors-from-man
+binary-without-manpage
 
 # Breaks for python-gdal vs gdal-bin due to gdal_retile.1 collision
 # in pre-1.10 versions distributed in experimental. Just for safety.
-gdal-bin: package-relation-with-self breaks: gdal-bin (<< 1.10.0-0~)
+package-relation-with-self breaks: gdal-bin (<< 1.10.0-0~)
 
 # False positive on: "(319) 369-3131"
-gdal-bin: copyright-year-in-future 3131 *
+copyright-year-in-future 3131 *
 

debian/gdal-data.lintian-overrides

 # False positive on: "(319) 369-3131"
-gdal-data: copyright-year-in-future 3131 *
+copyright-year-in-future 3131 *
 

debian/libgdal-dev.lintian-overrides

 # Man pages are automatically generated with sphinx.
-libgdal-dev: hyphen-used-as-minus-sign
+hyphen-used-as-minus-sign
 
 # False positive on: "(319) 369-3131"
-libgdal-dev: copyright-year-in-future 3131 *
+copyright-year-in-future 3131 *
 
 # GDAL doesn't use Multi-Arch, it breaks too many rdeps
-libgdal-dev: pkg-config-unavailable-for-cross-compilation usr/lib/pkgconfig/gdal.pc
+pkg-config-unavailable-for-cross-compilation usr/lib/pkgconfig/gdal.pc
 

debian/libgdal-doc.lintian-overrides

 # False positive on: "(319) 369-3131"
-libgdal-doc: copyright-year-in-future 3131 *
+copyright-year-in-future 3131 *
 

debian/libgdal-java.lintian-overrides

 # False positive on: "(319) 369-3131"
-libgdal-java: copyright-year-in-future 3131 *
+copyright-year-in-future 3131 *
+
+# Cannot easily be fixed
+file-references-package-build-path *
 

debian/libgdal-perl.lintian-overrides

 # False positive on: "(319) 369-3131"
-libgdal-perl: copyright-year-in-future 3131 *
+copyright-year-in-future 3131 *
+
+# Cannot easily be fixed
+file-references-package-build-path *
 

debian/libgdal20.lintian-overrides

 # False positive on: {136, "Socialist Republic of Viet Nam"},
-libgdal20: spelling-error-in-binary * Nam Name
+spelling-error-in-binary * Nam Name
 
 # False positive on: "(319) 369-3131"
-libgdal20: copyright-year-in-future 3131 *
+copyright-year-in-future 3131 *
+
+# Cannot easily be fixed
+file-references-package-build-path *
 

debian/python-gdal.lintian-overrides

 # Man pages are automatically generated with sphinx.
-python-gdal: hyphen-used-as-minus-sign 
-python-gdal: binary-without-manpage
+hyphen-used-as-minus-sign
+binary-without-manpage
 
 # QGIS plugins rely on .py extension, see: http://hub.qgis.org/issues/9924
-python-gdal: script-with-language-extension usr/bin/*.py
+script-with-language-extension usr/bin/*.py
 
 # False positive on: "(319) 369-3131"
-python-gdal: copyright-year-in-future 3131 *
+copyright-year-in-future 3131 *
 

debian/python3-gdal.lintian-overrides

 # False positive on: "(319) 369-3131"
-python3-gdal: copyright-year-in-future 3131 *
+copyright-year-in-future 3131 *
 

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)