debian/changelog

-gdal (2.2.3+dfsg-2) UNRELEASED; urgency=medium
+gdal (2.2.3+dfsg-2~exp1) experimental; urgency=medium
 
   [ Francesco Paolo Lovergine ]
   * Added a couple of missing build-dep to correctly generate Perl binding
@@ -16,8 +16,14 @@ gdal (2.2.3+dfsg-2) UNRELEASED; urgency=medium
   * Reorder build dependencies (sorted by name).
   * Remove jquery symlinks and dependencies.
   * Update copyright-format URL to use HTTPS.
+  * Add upstream patch to avoid potential issue with CPL circular buffers.
+  * Bump Standards-Version to 4.1.3, no changes.
+  * Update symbols for powerpcspe.
+  * Move libgdal-perl documentation to separate arch:all package.
+  * Add lintian override for pkg-config-unavailable-for-cross-compilation.
+  * Add patch to fix spelling errors.
 
- -- Francesco Paolo Lovergine <frankie@debian.org>  Tue, 02 Jan 2018 12:27:12 +0100
+ -- Bas Couwenberg <sebastic@debian.org>  Mon, 29 Jan 2018 22:45:49 +0100
 
 gdal (2.2.3+dfsg-1) unstable; urgency=medium
 

debian/control

@@ -59,7 +59,7 @@ Build-Depends: debhelper (>= 9.20160114),
                zlib1g-dev
 Build-Conflicts: automake1.11,
                  python-setuptools
-Standards-Version: 4.1.2
+Standards-Version: 4.1.3
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/gdal.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gdal.git
 Homepage: http://www.gdal.org/
@@ -292,6 +292,7 @@ Section: perl
 Depends: ${perl:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
+Suggests: libgdal-perl-doc
 Description: Perl bindings to the Geospatial Data Abstraction Library
  GDAL is a translator library for raster geospatial data formats.
  As a library, it presents a single abstract data model to the
@@ -311,6 +312,31 @@ Description: Perl bindings to the Geospatial Data Abstraction Library
  .
  This package contains Perl bindings for GDAL/OGR library.
 
+Package: libgdal-perl-doc
+Architecture: all
+Depends: ${misc:Depends}
+Breaks: libgdal-perl (<< 2.2.3+dfsg-2~exp1)
+Replaces: libgdal-perl (<< 2.2.3+dfsg-2~exp1)
+Section: doc
+Description: Documentation for GDAL Perl bindings
+ As a library, it presents a single abstract data model to the
+ calling application for all supported formats. The related OGR
+ library (which lives within the GDAL source tree) provides
+ a similar capability for simple features vector data.
+ .
+ GDAL supports 40+ popular data formats, including commonly used
+ ones (GeoTIFF, JPEG, PNG and more) as well as the ones used in
+ GIS and remote sensing software packages (ERDAS Imagine,
+ ESRI Arc/Info, ENVI, PCI Geomatics). Also supported many remote
+ sensing and scientific data distribution formats such as HDF,
+ EOS FAST, NOAA L1B, NetCDF, FITS.
+ .
+ OGR library supports popular vector formats like ESRI Shapefile,
+ TIGER data, S57, MapInfo File, DGN, GML and more.
+ .
+ This package contains the documentation of the Perl bindings for
+ GDAL/OGR library.
+
 Package: libgdal-java
 Architecture: any
 Section: java

debian/libgdal-dev.lintian-overrides

@@ -4,3 +4,6 @@ libgdal-dev: hyphen-used-as-minus-sign
 # False positive on: "(319) 369-3131"
 libgdal-dev: 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
+

debian/libgdal-perl.doc-base → debian/libgdal-perl-doc.doc-base

@@ -4,5 +4,5 @@ Abstract: This manual describes the GDAL Perl API.
 Section: Science/Geoscience
 
 Format: HTML
-Index: /usr/share/doc/libgdal-perl/html/index.html
-Files: /usr/share/doc/libgdal-perl/html/*.html
+Index: /usr/share/doc/libgdal-perl-doc/html/index.html
+Files: /usr/share/doc/libgdal-perl-doc/html/*.html

debian/libgdal20.symbols.powerpcspe

@@ -2381,8 +2381,8 @@ libgdal.so.20 libgdal20 #MINVER#
  (c++)"GDALDefaultRasterAttributeTable::~GDALDefaultRasterAttributeTable()@Base" 2.2.0 1
  (c++)"GDALDefaultRasterAttributeTable::~GDALDefaultRasterAttributeTable()@Base" 2.2.0 1
  (c++)"GDALDefaultRasterAttributeTable::~GDALDefaultRasterAttributeTable()@Base" 2.2.0 1
- (c++)"OGR::transcode(unsigned short const*, CPLString&, int)@Base" 2.2.0 1
- (c++)"OGR::transcode(unsigned short const*, int)@Base" 2.2.0 1
+ (c++)"OGR::transcode(char16_t const*, CPLString&, int)@Base" 2.2.3 1
+ (c++)"OGR::transcode(char16_t const*, int)@Base" 2.2.3 1
  (c++)"CADFile::ReadTables(CADFile::OpenOptions)@Base" 2.2.0 1
  (c++)"CADFile::isReadingUnsupportedGeometries()@Base" 2.2.0 1
  (c++)"CADFile::GetLayer(unsigned int)@Base" 2.2.0 1
@@ -2881,6 +2881,7 @@ libgdal.so.20 libgdal20 #MINVER#
  (c++)"OGRCircularString::getEnvelope(OGREnvelope3D*) const@Base" 2.2.0 1
  (c++)"OGRCircularString::IsFullCircle(double&, double&, double&) const@Base" 2.2.0 1
  (c++)"OGRCircularString::ContainsPoint(OGRPoint const*) const@Base" 2.2.0 1
+ (c++)"OGRCircularString::IntersectsPoint(OGRPoint const*) const@Base" 2.2.3 1
  (c++)"OGRCircularString::getGeometryName() const@Base" 2.2.0 1
  (c++)"OGRCircularString::getGeometryType() const@Base" 2.2.0 1
  (c++)"OGRCircularString::hasCurveGeometry(int) const@Base" 2.2.0 1

debian/patches/series

@@ -10,3 +10,5 @@ perl-vendor
 privacy-breach-logo.patch
 privacy-breach-generic.patch
 perl-doxyfile
+svn-r41303_gnm-avoid-potential-issue-with-CPL-circular-buffers.patch
+spelling-errors.patch

debian/patches/spelling-errors.patch

+Description: Fix spelling errors.
+ * Invalide -> Invalid
+Author: Bas Couwenberg <sebastic@debian.org>
+
+--- a/ogr/ogrsf_frmts/kml/ogrkmldatasource.cpp
++++ b/ogr/ogrsf_frmts/kml/ogrkmldatasource.cpp
+@@ -296,7 +296,7 @@ int OGRKMLDataSource::Create( const char
+             CPLFree( pszAltitudeMode_ );
+             pszAltitudeMode_ = NULL;
+             CPLError( CE_Warning, CPLE_AppDefined,
+-                      "Invalide AltitideMode specified, ignoring" );
++                      "Invalid AltitideMode specified, ignoring" );
+         }
+     }
+     else

debian/patches/svn-r41303_gnm-avoid-potential-issue-with-CPL-circular-buffers.patch

+Description: GNM: avoid potential issue with CPL circular buffers (can happen if there are extra drivers that use CPLGet....() functions)
+Author: Even Rouault <even dot rouault at spatialys dot com>
+Origin: https://trac.osgeo.org/gdal/changeset/41303/
+
+--- a/gnm/gnm_frmts/file/gnmfilenetwork.cpp
++++ b/gnm/gnm_frmts/file/gnmfilenetwork.cpp
+@@ -101,10 +101,10 @@ CPLErr GNMFileNetwork::Open(GDALOpenInfo
+     }
+ 
+     m_poLayerDriver = m_pMetadataDS->GetDriver();
+-    const char* pszExt = CPLGetExtension(soMetadatafile);
++    CPLString osExt = CPLGetExtension(soMetadatafile);
+ 
+     CPLString soGraphfile = CPLFormFilename(m_soNetworkFullName,
+-                                            GNM_SYSLAYER_GRAPH, pszExt);
++                                            GNM_SYSLAYER_GRAPH, osExt);
+     m_pGraphDS = (GDALDataset*) GDALOpenEx( soGraphfile, GDAL_OF_VECTOR |
+                                             GDAL_OF_UPDATE, NULL, NULL, NULL );
+     if( NULL == m_pGraphDS )
+@@ -120,7 +120,7 @@ CPLErr GNMFileNetwork::Open(GDALOpenInfo
+     }
+ 
+     CPLString soFeaturesfile = CPLFormFilename(m_soNetworkFullName,
+-                                            GNM_SYSLAYER_FEATURES, pszExt);
++                                            GNM_SYSLAYER_FEATURES, osExt);
+     m_pFeaturesDS = (GDALDataset*) GDALOpenEx( soFeaturesfile, GDAL_OF_VECTOR |
+                                                GDAL_OF_UPDATE, NULL, NULL, NULL );
+     if( NULL == m_pFeaturesDS )

debian/rules

@@ -205,7 +205,7 @@ override_dh_installdocs:
 	dh_installdocs
 
 	# Remove autogenerated Doxygen files
-	rm -f $(CURDIR)/debian/*/usr/share/doc/libgdal-perl/*/*.md5
+	rm -f $(CURDIR)/debian/*/usr/share/doc/libgdal-perl-doc/*/*.md5
 
 override_dh_python2:
 	dh_python2 -X.info -ppython-gdal