[Git][debian-gis-team/gdal][master] 8 commits: Add upstream patch to avoid potential issue with CPL circular buffers.
Sebastiaan Couwenberg
gitlab at salsa.debian.org
Tue Jan 30 09:24:30 UTC 2018
Sebastiaan Couwenberg pushed to branch master at Debian GIS Project / gdal
Commits:
297f3e5e by Bas Couwenberg at 2018-01-29T22:28:35+01:00
Add upstream patch to avoid potential issue with CPL circular buffers.
- - - - -
254a5526 by Bas Couwenberg at 2018-01-29T22:28:35+01:00
Bump Standards-Version to 4.1.3, no changes.
- - - - -
02c3a646 by Bas Couwenberg at 2018-01-29T22:34:15+01:00
Update symbols for powerpcspe.
- - - - -
99b403d0 by Bas Couwenberg at 2018-01-30T07:06:47+01:00
Move libgdal-perl documentation to separate arch:all package.
- - - - -
b607a148 by Bas Couwenberg at 2018-01-30T07:06:47+01:00
Add lintian override for pkg-config-unavailable-for-cross-compilation.
- - - - -
5886cf97 by Bas Couwenberg at 2018-01-30T07:09:29+01:00
Add patch to fix spelling errors.
- - - - -
dab7c60c by Bas Couwenberg at 2018-01-30T08:56:41+01:00
Strip trailing whitespace from changelog file.
- - - - -
c32b7410 by Bas Couwenberg at 2018-01-30T08:56:41+01:00
Set distribution to experimental.
- - - - -
10 changed files:
- debian/changelog
- debian/control
- debian/libgdal-dev.lintian-overrides
- debian/libgdal-perl.doc-base → debian/libgdal-perl-doc.doc-base
- debian/libgdal-perl.docs → debian/libgdal-perl-doc.docs
- debian/libgdal20.symbols.powerpcspe
- debian/patches/series
- + debian/patches/spelling-errors.patch
- + debian/patches/svn-r41303_gnm-avoid-potential-issue-with-CPL-circular-buffers.patch
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-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
@@ -8,7 +8,7 @@ gdal (2.2.3+dfsg-2) UNRELEASED; urgency=medium
* The doxygen jquery is currently a fork of jquery in minified form, and it
is not compatible with the modern one. Replacement with the libjsquery
provided now removed.
- * autotools_dev plugin is deprecated since debhelper >= 9.20160114 and now
+ * autotools_dev plugin is deprecated since debhelper >= 9.20160114 and now
no more supported.
[ Bas Couwenberg ]
@@ -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 at debian.org> Tue, 02 Jan 2018 12:27:12 +0100
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 29 Jan 2018 22:45:49 +0100
gdal (2.2.3+dfsg-1) unstable; urgency=medium
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/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
=====================================
--- a/debian/libgdal-dev.lintian-overrides
+++ b/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
=====================================
--- a/debian/libgdal-perl.doc-base
+++ b/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/libgdal-perl.docs → debian/libgdal-perl-doc.docs
=====================================
=====================================
debian/libgdal20.symbols.powerpcspe
=====================================
--- a/debian/libgdal20.symbols.powerpcspe
+++ b/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 at Base" 2.2.0 1
(c++)"OGRCircularString::IsFullCircle(double&, double&, double&) const at Base" 2.2.0 1
(c++)"OGRCircularString::ContainsPoint(OGRPoint const*) const at Base" 2.2.0 1
+ (c++)"OGRCircularString::IntersectsPoint(OGRPoint const*) const at Base" 2.2.3 1
(c++)"OGRCircularString::getGeometryName() const at Base" 2.2.0 1
(c++)"OGRCircularString::getGeometryType() const at Base" 2.2.0 1
(c++)"OGRCircularString::hasCurveGeometry(int) const at Base" 2.2.0 1
=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/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
=====================================
--- /dev/null
+++ b/debian/patches/spelling-errors.patch
@@ -0,0 +1,15 @@
+Description: Fix spelling errors.
+ * Invalide -> Invalid
+Author: Bas Couwenberg <sebastic at 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
=====================================
--- /dev/null
+++ b/debian/patches/svn-r41303_gnm-avoid-potential-issue-with-CPL-circular-buffers.patch
@@ -0,0 +1,28 @@
+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
=====================================
--- a/debian/rules
+++ b/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
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/compare/d78cb6fee4577180387184fe02b280dcde2e6750...c32b74106f8b9d10fb3ea044941e038f138bb89c
---
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/compare/d78cb6fee4577180387184fe02b280dcde2e6750...c32b74106f8b9d10fb3ea044941e038f138bb89c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20180130/c3bc1f34/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list