[gdal] 08/09: Drop existant-typo patch, applied upstream.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Wed Sep 16 21:03:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository gdal.
commit 6c24abc92d8261ef1c0c92feab8272ca3403fb88
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Sep 16 21:12:20 2015 +0200
Drop existant-typo patch, applied upstream.
Refresh remaining patches.
---
debian/changelog | 2 +
debian/patches/accomodate-typo | 14 ++---
debian/patches/consistant-typo | 16 +++---
debian/patches/developement-typo | 2 +-
debian/patches/existant-typo | 111 ---------------------------------------
debian/patches/explicitely-typo | 10 ++--
debian/patches/initalize-typo | 6 +--
debian/patches/ressource-typo | 6 +--
debian/patches/series | 1 -
debian/patches/spatialite | 6 +--
debian/patches/supress-typo | 72 ++++++++++++-------------
debian/patches/usefull-typo | 36 ++++++-------
12 files changed, 86 insertions(+), 196 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c8a9f0c..6436eb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ gdal (1.11.3~rc2+dfsg-1) UNRELEASED; urgency=medium
* Update watch file for 1.11.3 pre-releases.
* New upstream release candidate.
+ * Drop existant-typo patch, applied upstream.
+ Refresh remaining patches.
-- Bas Couwenberg <sebastic at debian.org> Wed, 16 Sep 2015 20:24:43 +0200
diff --git a/debian/patches/accomodate-typo b/debian/patches/accomodate-typo
index ac2475b..49bcee1 100644
--- a/debian/patches/accomodate-typo
+++ b/debian/patches/accomodate-typo
@@ -5,7 +5,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/NEWS
+++ b/NEWS
-@@ -4024,7 +4024,7 @@ GeoTIFF driver :
+@@ -4141,7 +4141,7 @@ GeoTIFF driver :
* Use official value for inverse flattening of the WGS84 ellipsoid (#2787)
* Add metadata domain for XML documents (#2786)
* Make GTiff driver friendly with files with huge number of bands and pixel interleaving (#2838)
@@ -38,7 +38,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
nBlockXSize * nBlockYSize * (GDALGetDataTypeSize(eDataType) / 8) < GDALGetCacheMax64() / poGDS->nBands)
--- a/frmts/gtiff/gt_wkt_srs.cpp
+++ b/frmts/gtiff/gt_wkt_srs.cpp
-@@ -433,7 +433,7 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIF
+@@ -445,7 +445,7 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIF
&& psDefn->UOMLengthInMeters != 1.0 )
{
psDefn->ProjParm[iParm] /= psDefn->UOMLengthInMeters;
@@ -49,14 +49,14 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/man/man1/gdalwarp.1
+++ b/man/man1/gdalwarp.1
-@@ -125,7 +125,7 @@ The source file name(s).
- The destination file name.
+@@ -122,7 +122,7 @@ The source file name(s)\&.
+ The destination file name\&.
.PP
.PP
--Mosaicing into an existing output file is supported if the output file already exists. The spatial extent of the existing file will not be modified to accomodate new data, so you may have to remove it in that case, or use the -overwrite option.
-+Mosaicing into an existing output file is supported if the output file already exists. The spatial extent of the existing file will not be modified to accommodate new data, so you may have to remove it in that case, or use the -overwrite option.
+-Mosaicing into an existing output file is supported if the output file already exists\&. The spatial extent of the existing file will not be modified to accomodate new data, so you may have to remove it in that case, or use the -overwrite option\&.
++Mosaicing into an existing output file is supported if the output file already exists\&. The spatial extent of the existing file will not be modified to accommodate new data, so you may have to remove it in that case, or use the -overwrite option\&.
.PP
- Polygon cutlines may be used as a mask to restrict the area of the destination file that may be updated, including blending. If the OGR layer containing the cutline features has no explicit SRS, the cutline features must be in the SRS of the destination file. When outputing to a not yet existing target dataset, its extent will be the one of the original raster unless -te or -crop_to_cutline are specified.
+ Polygon cutlines may be used as a mask to restrict the area of the destination file that may be updated, including blending\&. If the OGR layer containing the cutline features has no explicit SRS, the cutline features must be in the SRS of the destination file\&. When outputing to a not yet existing target dataset, its extent will be the one of the original raster unless -te or -crop_to_cutline are specified\&.
.SH "EXAMPLE"
--- a/ogr/ogr_api.cpp
+++ b/ogr/ogr_api.cpp
diff --git a/debian/patches/consistant-typo b/debian/patches/consistant-typo
index 1f2c9b5..fe305f5 100644
--- a/debian/patches/consistant-typo
+++ b/debian/patches/consistant-typo
@@ -5,7 +5,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/NEWS
+++ b/NEWS
-@@ -2067,7 +2067,7 @@ Utilities:
+@@ -2184,7 +2184,7 @@ Utilities:
* Add gdal_ls.py and gdal_cp.py as Python samples
* Add new sample utility, gdal_edit.py, to edit in place various information of an existing GDAL dataset (projection, geotransform, nodata, metadata) (#4220)
* gdalcopyproj.py: make it copy GCPs too
@@ -14,7 +14,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* Add --pause for convenient debugging, document it and --locale
Multi-driver topics:
-@@ -2525,7 +2525,7 @@ Utilities:
+@@ -2642,7 +2642,7 @@ Utilities:
* ogr2ogr: take into account fields specified in the -where clause in combinations with -select to create the correct list of fields to pass to SetIgnoredFields() (#4015)
* ogr2ogr: fix -zfield option so that the modified geometry properly reports coordinate dimension = 3. Also avoids it to be in the list of ignored field names
* ogr2ogr: add -simplify option to simplify geometries
@@ -23,7 +23,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* ogrinfo/ogr2ogr: exit when SetAttributeFilter() fails, instead of silently going on (#4261)
Multi driver topics:
-@@ -3031,7 +3031,7 @@ Utilities :
+@@ -3148,7 +3148,7 @@ Utilities :
to align on a standard grid (#3772)
AAIGRID driver:
@@ -32,7 +32,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
GDT_Float32 case; small optimization to avoid reading the first 100K when
we know that the datatype is already Float32
* Allow reading files where decimal separator is comma (#3668)
-@@ -3138,7 +3138,7 @@ GTX driver:
+@@ -3255,7 +3255,7 @@ GTX driver:
* Read NOAA .gtx vertical datum shift files.
GXF driver:
@@ -41,7 +41,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
GDT_Float32 case
* Introduce a GXF_DATATYPE configuration option that can be set to Float64
* Use GDALGetScanline() instead of GDALGetRawScanline() so that #SENS
-@@ -3371,7 +3371,7 @@ Core:
+@@ -3488,7 +3488,7 @@ Core:
OGR_G_SymDifference() and OGR_G_UnionCascaded()
* Add C function: OGR_F_StealGeometry()
* Move Centroid() method from OGRPolygon to OGRGeometry base class to be able
@@ -50,7 +50,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
ST_Centroid() capabilities and the underlying GEOS method
* Make the GetStyleTable() SetStyleTable() SetStyleTableDirectly() methods on
datasources and layers virtual (#2978)
-@@ -4462,7 +4462,7 @@ General:
+@@ -4579,7 +4579,7 @@ General:
osr.ImportFromMICoordSys(), osr.ExportToMICoordSys(), SpatialReference.Clone()
osr.EPSGTreatsAsLatLong(), osr.ImportFromEPSGA()
* Make resampling an optionnal parameter for gdal.RegenerateOverview(),
@@ -59,7 +59,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* NONNULL checks have been added to check various arguments of methods
* add missing constants : DCAP_VIRTUALIO, color interpretations, OGR constants
-@@ -4641,7 +4641,7 @@ Utilities:
+@@ -4758,7 +4758,7 @@ Utilities:
* gdalinfo: Display checksums on overviews when -checksum is specified
* gdalinfo: Display whether the mask band has overviews
* ogr2ogr: reset -gt to 1 with -skipfailures, document -gt (#2409)
@@ -70,7 +70,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* gdal_rasterize: check that coordinates systems match (Ticket #1937)
--- a/alg/gdaltransformer.cpp
+++ b/alg/gdaltransformer.cpp
-@@ -797,7 +797,7 @@ retry:
+@@ -799,7 +799,7 @@ retry:
/* -------------------------------------------------------------------- */
diff --git a/debian/patches/developement-typo b/debian/patches/developement-typo
index 7825654..4c8d247 100644
--- a/debian/patches/developement-typo
+++ b/debian/patches/developement-typo
@@ -5,7 +5,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/NEWS
+++ b/NEWS
-@@ -1142,7 +1142,7 @@ Build(Unix):
+@@ -1259,7 +1259,7 @@ Build(Unix):
* New optional dependencies : libpcre (for regular expressions support in SQLite), libxml2 (validation of GML files)
* --with-python: make it work with python3, and also accept path to python binary as argument of --with-python (#4725)
* Use nc-config to detect netcdf compilation and linking parameters (#4424)
diff --git a/debian/patches/existant-typo b/debian/patches/existant-typo
deleted file mode 100644
index ae31f5f..0000000
--- a/debian/patches/existant-typo
+++ /dev/null
@@ -1,111 +0,0 @@
-Description: Fix 'existant' typo, replace with 'existent'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/gdal/ticket/6074
-
---- a/frmts/envisat/EnvisatFile.c
-+++ b/frmts/envisat/EnvisatFile.c
-@@ -1386,7 +1386,7 @@ int EnvisatFile_ReadDatasetChunk( Envisa
- {
- if( ds_index < 0 || ds_index >= self->ds_count )
- {
-- SendError( "Attempt to read non-existant dataset in "
-+ SendError( "Attempt to read non-existent dataset in "
- "EnvisatFile_ReadDatasetChunk()" );
- return FAILURE;
- }
-@@ -1451,7 +1451,7 @@ int EnvisatFile_WriteDatasetRecord( Envi
-
- if( ds_index < 0 || ds_index >= self->ds_count )
- {
-- SendError( "Attempt to write non-existant dataset in "
-+ SendError( "Attempt to write non-existent dataset in "
- "EnvisatFile_WriteDatasetRecord()" );
- return FAILURE;
- }
-@@ -1568,7 +1568,7 @@ int EnvisatFile_ReadDatasetRecordChunk(
-
- if( ds_index < 0 || ds_index >= self->ds_count )
- {
-- SendError( "Attempt to read non-existant dataset in "
-+ SendError( "Attempt to read non-existent dataset in "
- "EnvisatFile_ReadDatasetRecordChunk()" );
- return FAILURE;
- }
---- a/frmts/pcidsk/sdk/channel/cpcidskchannel.cpp
-+++ b/frmts/pcidsk/sdk/channel/cpcidskchannel.cpp
-@@ -200,7 +200,7 @@ PCIDSKChannel *CPCIDSKChannel::GetOvervi
- EstablishOverviewInfo();
-
- if( overview_index < 0 || overview_index >= (int) overview_infos.size() )
-- ThrowPCIDSKException( "Non existant overview (%d) requested.",
-+ ThrowPCIDSKException( "Non existent overview (%d) requested.",
- overview_index );
-
- if( overview_bands[overview_index] == NULL )
-@@ -231,7 +231,7 @@ bool CPCIDSKChannel::IsOverviewValid( in
- EstablishOverviewInfo();
-
- if( overview_index < 0 || overview_index >= (int) overview_infos.size() )
-- ThrowPCIDSKException( "Non existant overview (%d) requested.",
-+ ThrowPCIDSKException( "Non existent overview (%d) requested.",
- overview_index );
-
- int sis_id, validity=0;
-@@ -252,7 +252,7 @@ std::string CPCIDSKChannel::GetOverviewR
- EstablishOverviewInfo();
-
- if( overview_index < 0 || overview_index >= (int) overview_infos.size() )
-- ThrowPCIDSKException( "Non existant overview (%d) requested.",
-+ ThrowPCIDSKException( "Non existent overview (%d) requested.",
- overview_index );
-
- int sis_id, validity=0;
-@@ -275,7 +275,7 @@ void CPCIDSKChannel::SetOverviewValidity
- EstablishOverviewInfo();
-
- if( overview_index < 0 || overview_index >= (int) overview_infos.size() )
-- ThrowPCIDSKException( "Non existant overview (%d) requested.",
-+ ThrowPCIDSKException( "Non existent overview (%d) requested.",
- overview_index );
-
- int sis_id, validity=0;
---- a/frmts/pcidsk/sdk/channel/ctiledchannel.cpp
-+++ b/frmts/pcidsk/sdk/channel/ctiledchannel.cpp
-@@ -359,7 +359,7 @@ int CTiledChannel::ReadBlock( int block_
-
- if( block_index < 0 || block_index >= tile_count )
- {
-- ThrowPCIDSKException( "Requested non-existant block (%d)",
-+ ThrowPCIDSKException( "Requested non-existent block (%d)",
- block_index );
- }
-
-@@ -517,7 +517,7 @@ int CTiledChannel::WriteBlock( int block
-
- if( block_index < 0 || block_index >= tile_count )
- {
-- ThrowPCIDSKException( "Requested non-existant block (%d)",
-+ ThrowPCIDSKException( "Requested non-existent block (%d)",
- block_index );
- }
-
---- a/frmts/pcidsk/sdk/segment/cpcidskbitmap.cpp
-+++ b/frmts/pcidsk/sdk/segment/cpcidskbitmap.cpp
-@@ -238,7 +238,7 @@ int CPCIDSKBitmap::ReadBlock( int block_
-
- if( block_index < 0 || block_index >= GetBlockCount() )
- {
-- ThrowPCIDSKException( "Requested non-existant block (%d)",
-+ ThrowPCIDSKException( "Requested non-existent block (%d)",
- block_index );
- }
- /* -------------------------------------------------------------------- */
-@@ -343,7 +343,7 @@ int CPCIDSKBitmap::GetOverviewCount()
- PCIDSKChannel *CPCIDSKBitmap::GetOverview( CPL_UNUSED int i )
- {
- // The %d is ignored in the exception.
-- ThrowPCIDSKException("Non-existant overview %d requested on bitmap segment.");
-+ ThrowPCIDSKException("Non-existent overview %d requested on bitmap segment.");
- return NULL;
- }
-
diff --git a/debian/patches/explicitely-typo b/debian/patches/explicitely-typo
index 5ca2cab..0770966 100644
--- a/debian/patches/explicitely-typo
+++ b/debian/patches/explicitely-typo
@@ -5,7 +5,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/NEWS
+++ b/NEWS
-@@ -1670,7 +1670,7 @@ GML driver:
+@@ -1787,7 +1787,7 @@ GML driver:
* Allow reading srsDimension attribute when set on LineString element, and not on posList (#4663)
* Partial support for reading GML 3.3 compat encoding profile, limited to <gmlce:SimplePolygon>, <gmlce:SimpleRectangle>, <gmlce:SimpleTriangle>, <gmlce:SimpleMultiPoint> elements
* Support WFS GetFeature response document to be piped and opened with /vsistdin/
@@ -14,7 +14,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* Improve detection of extent and srs for WFS 2.0
* Allow ISO-8859-15 encoded files to be used by Expat parser (#4829)
* Handle CompositeCurve like MultiCurve (for NAS)
-@@ -2471,7 +2471,7 @@ Core:
+@@ -2588,7 +2588,7 @@ Core:
* OGR SQL: recognize optional ESCAPE escape_char clause
* OGR SQL: allow NULL to be used as a value, so that 'SELECT *, NULL FROM foo works'
* OGR SQL: Accept doublequoting of column_name in 'SELECT DISTINCT "column_name" FROM table_name' (#3966)
@@ -163,7 +163,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
}
--- a/frmts/pdf/pdfdataset.cpp
+++ b/frmts/pdf/pdfdataset.cpp
-@@ -2510,7 +2510,7 @@ void PDFDataset::TurnLayersOnOff()
+@@ -2508,7 +2508,7 @@ void PDFDataset::TurnLayersOnOff()
oIter->second->setState(OptionalContentGroup::On);
}
@@ -172,7 +172,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
// in the list.
size_t nLen = strlen(papszLayers[i]);
int bFoundChildLayer = FALSE;
-@@ -4972,7 +4972,7 @@ CPLErr PDFDataset::SetGeoTransform(doubl
+@@ -4970,7 +4970,7 @@ CPLErr PDFDataset::SetGeoTransform(doubl
bGeoTransformValid = TRUE;
bProjDirty = TRUE;
@@ -181,7 +181,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
if (!bNeatLineDirty)
SetMetadataItem("NEATLINE", NULL);
return CE_None;
-@@ -5155,7 +5155,7 @@ CPLErr PDFDataset::SetGCPs( int nGCPCoun
+@@ -5153,7 +5153,7 @@ CPLErr PDFDataset::SetGCPs( int nGCPCoun
bProjDirty = TRUE;
diff --git a/debian/patches/initalize-typo b/debian/patches/initalize-typo
index 1c60a5d..503b74e 100644
--- a/debian/patches/initalize-typo
+++ b/debian/patches/initalize-typo
@@ -16,12 +16,12 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
% gdal_merge.py -init "0 0 255" -o out.tif in1.tif in2.tif
--- a/man/man1/gdal_merge.1
+++ b/man/man1/gdal_merge.1
-@@ -67,7 +67,7 @@ Create an image with the pixels in all b
+@@ -64,7 +64,7 @@ Create an image with the pixels in all b
.fi
.PP
.PP
--Create an RGB image that shows blue in pixels with no data. The first two bands will be initialized to 0 and the third band will be initalized to 255.
-+Create an RGB image that shows blue in pixels with no data. The first two bands will be initialized to 0 and the third band will be initialized to 255.
+-Create an RGB image that shows blue in pixels with no data\&. The first two bands will be initialized to 0 and the third band will be initalized to 255\&.
++Create an RGB image that shows blue in pixels with no data\&. The first two bands will be initialized to 0 and the third band will be initialized to 255\&.
.PP
.PP
.nf
diff --git a/debian/patches/ressource-typo b/debian/patches/ressource-typo
index 79c66d0..3a38a01 100644
--- a/debian/patches/ressource-typo
+++ b/debian/patches/ressource-typo
@@ -5,7 +5,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/NEWS
+++ b/NEWS
-@@ -2416,7 +2416,7 @@ USGSDEM driver:
+@@ -2533,7 +2533,7 @@ USGSDEM driver:
VRT driver:
* Implement VRTDataset::IRasterIO() that can delegate to source Dataset::RasterIO() in particular cases
* Implement GetMinimum() and GetMaximum()
@@ -14,7 +14,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* VRTComplexSource: correctly deal with complex data type (#3977)
* Fix 2 segfaults related to using '<VRTDataset', but with invalid XML, as the target filename of VRTDataset::Create()
* Fix 'VRTDerivedRasterBand with ComplexSource and nodata value yields potentially uninitialized buffer' (#4045)
-@@ -2938,7 +2938,7 @@ Port:
+@@ -3055,7 +3055,7 @@ Port:
Core:
* RFC 24: progressive/async raster reading
* On Unix, add capability of opening the target of a symlink through GDALOpen()
@@ -23,7 +23,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
GDAL virtual filenames in software offering only file explorers (#3902)
* Assume anything less than 100000 for GDAL_CACHEMAX is measured in metabytes.
* Read cartesian coordinates if applicable in GDALLoadOziMapFile().
-@@ -3358,7 +3358,7 @@ Core:
+@@ -3475,7 +3475,7 @@ Core:
* Add OGRLayer::GetName() and OGRLayer::GetGeomType() virtual methods,
and their C and SWIG mappings (#3719)
* On Unix, add capability of opening the target of a symlink through OGROpen()
diff --git a/debian/patches/series b/debian/patches/series
index 4938718..fdad713 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,5 +28,4 @@ doc-brief
hardening
recommanded-typo
perl-vendor
-existant-typo
libkml-pkgconfig
diff --git a/debian/patches/spatialite b/debian/patches/spatialite
index 425ac75..42944f2 100644
--- a/debian/patches/spatialite
+++ b/debian/patches/spatialite
@@ -3,7 +3,7 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
Last-Update: 2011-05-12
--- a/configure
+++ b/configure
-@@ -25265,7 +25265,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
+@@ -25267,7 +25267,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -12,7 +12,7 @@ Last-Update: 2011-05-12
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -25319,7 +25319,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
+@@ -25321,7 +25321,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -21,7 +21,7 @@ Last-Update: 2011-05-12
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -25411,7 +25411,7 @@ if ${ac_cv_lib_spatialite_spatialite_tar
+@@ -25413,7 +25413,7 @@ if ${ac_cv_lib_spatialite_spatialite_tar
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
diff --git a/debian/patches/supress-typo b/debian/patches/supress-typo
index 43477e2..2361c1f 100644
--- a/debian/patches/supress-typo
+++ b/debian/patches/supress-typo
@@ -25,7 +25,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
<dt> <b>-dsco</b> <em>NAME=VALUE</em>:</dt><dd> Dataset creation option
--- a/NEWS
+++ b/NEWS
-@@ -2053,7 +2053,7 @@ Utilities:
+@@ -2170,7 +2170,7 @@ Utilities:
* gdalwarp: speed-up when using -tps with large number of GCPs
* gdalwarp: add support for optional use of libarmadillo to speed-up matrix inversion in -tps mode
* gdalwarp: detect situations where the user will override the source file
@@ -34,7 +34,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* gdal_rasterize: fix half pixel shift when rasterizing points; make gdal_rasterize utility increase the computed raster extent by a half-pixel for point layers (#3774)
* gdal_rasterize: when source datasource has a single layer, use it implicitely if none of -l or -sql is specified
* nearblack: add -color option (#4085)
-@@ -3747,7 +3747,7 @@ Python bindings:
+@@ -3864,7 +3864,7 @@ Python bindings:
when used and set to True, None is returned when GDALGetGeoTransform()
returns CE_Failure (instead of the fake (0,1,0,0,0,1)); backward
compatibility preserved when the parameter isn't specified
@@ -118,16 +118,16 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */
--- a/gcore/gdaljp2metadata.cpp
+++ b/gcore/gdaljp2metadata.cpp
-@@ -900,7 +900,7 @@ int GDALJP2Metadata::ParseGMLCoverageDes
+@@ -902,7 +902,7 @@ int GDALJP2Metadata::ParseGMLCoverageDes
"FALSE" ) ) )
{
bNeedAxisFlip = FALSE;
- CPLDebug( "GMLJP2", "Supressed axis flipping based on GDAL_IGNORE_AXIS_ORIENTATION." );
+ CPLDebug( "GMLJP2", "Suppressed axis flipping based on GDAL_IGNORE_AXIS_ORIENTATION." );
}
-
- if( bNeedAxisFlip )
-@@ -1119,7 +1119,7 @@ GDALJP2Box *GDALJP2Metadata::CreateGMLJP
+
+ /* Some Pleiades files have explicit <gml:axisName>Easting</gml:axisName> */
+@@ -1158,7 +1158,7 @@ GDALJP2Box *GDALJP2Metadata::CreateGMLJP
"FALSE" ) ) )
{
bNeedAxisFlip = FALSE;
@@ -160,59 +160,48 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
SetMOFlags( nSavedMOFlags | GMO_IGNORE_UNIMPLEMENTED );
--- a/man/man1/gdal_fillnodata.1
+++ b/man/man1/gdal_fillnodata.1
-@@ -24,7 +24,7 @@ The gdal_fillnodata.py script fills sele
- Additional details on the algorithm are available in the GDALFillNodata() docs.
+@@ -21,7 +21,7 @@ The gdal_fillnodata\&.py script fills se
+ Additional details on the algorithm are available in the GDALFillNodata() docs\&.
.PP
.IP "\fB\fB-q\fP:\fP" 1c
--The script runs in quiet mode. The progress monitor is supressed and routine messages are not displayed.
-+The script runs in quiet mode. The progress monitor is suppressed and routine messages are not displayed.
+-The script runs in quiet mode\&. The progress monitor is supressed and routine messages are not displayed\&.
++The script runs in quiet mode\&. The progress monitor is suppressed and routine messages are not displayed\&.
.PP
.IP "\fB\fB-md\fP \fImax_distance\fP:\fP" 1c
- The maximum distance (in pixels) that the algorithm will search out for values to interpolate.
+ The maximum distance (in pixels) that the algorithm will search out for values to interpolate\&.
--- a/man/man1/gdal_polygonize.1
+++ b/man/man1/gdal_polygonize.1
-@@ -52,7 +52,7 @@ The name of the layer created to hold th
- The name of the field to create (defaults to 'DN').
+@@ -49,7 +49,7 @@ The name of the layer created to hold th
+ The name of the field to create (defaults to 'DN')\&.
.PP
.IP "\fB\fB-q\fP:\fP" 1c
--The script runs in quiet mode. The progress monitor is supressed and routine messages are not displayed.
-+The script runs in quiet mode. The progress monitor is suppressed and routine messages are not displayed.
+-The script runs in quiet mode\&. The progress monitor is supressed and routine messages are not displayed\&.
++The script runs in quiet mode\&. The progress monitor is suppressed and routine messages are not displayed\&.
.PP
.PP
.PP
--- a/man/man1/gdal_sieve.1
+++ b/man/man1/gdal_sieve.1
-@@ -23,7 +23,7 @@ The gdal_sieve.py script removes raster
- Additional details on the algorithm are available in the GDALSieveFilter() docs.
+@@ -20,7 +20,7 @@ The gdal_sieve\&.py script removes raste
+ Additional details on the algorithm are available in the GDALSieveFilter() docs\&.
.PP
.IP "\fB\fB-q\fP:\fP" 1c
--The script runs in quiet mode. The progress monitor is supressed and routine messages are not displayed.
-+The script runs in quiet mode. The progress monitor is suppressed and routine messages are not displayed.
+-The script runs in quiet mode\&. The progress monitor is supressed and routine messages are not displayed\&.
++The script runs in quiet mode\&. The progress monitor is suppressed and routine messages are not displayed\&.
.PP
.IP "\fB\fB-st\fP \fIthreshold\fP:\fP" 1c
- Set the size threshold in pixels. Only raster polygons smaller than this size will be removed.
+ Set the size threshold in pixels\&. Only raster polygons smaller than this size will be removed\&.
--- a/man/man1/ogrinfo.1
+++ b/man/man1/ogrinfo.1
-@@ -30,7 +30,7 @@ Open the data source in read-only mode.
+@@ -27,7 +27,7 @@ Open the data source in read-only mode\&
.IP "\fB\fB-al\fP:\fP" 1c
- List all features of all layers (used instead of having to give layer names as arguments).
+ List all features of all layers (used instead of having to give layer names as arguments)\&.
.IP "\fB\fB-so\fP:\fP" 1c
--Summary Only: supress listing of features, show only the summary information like projection, schema, feature count and extents.
-+Summary Only: suppress listing of features, show only the summary information like projection, schema, feature count and extents.
+-Summary Only: supress listing of features, show only the summary information like projection, schema, feature count and extents\&.
++Summary Only: suppress listing of features, show only the summary information like projection, schema, feature count and extents\&.
.IP "\fB\fB-q\fP:\fP" 1c
- Quiet verbose reporting of various information, including coordinate system, layer schema, extents, and feature count.
+ Quiet verbose reporting of various information, including coordinate system, layer schema, extents, and feature count\&.
.IP "\fB\fB-where\fP \fIrestricted_where\fP:\fP" 1c
---- a/man/man1/ogrlineref.1
-+++ b/man/man1/ogrlineref.1
-@@ -43,7 +43,7 @@ Show the usage.
- .IP "\fB\fB-progress\fP:\fP" 1c
- Show progress.
- .IP "\fB\fB-quiet\fP:\fP" 1c
--Supress all messages except errors and results.
-+Suppress all messages except errors and results.
- .IP "\fB\fB-f\fP \fIformat_name\fP:\fP" 1c
- Select an output format name. The default is to create a shapefile.
- .IP "\fB\fB-dsco\fP \fINAME=VALUE\fP:\fP" 1c
--- a/nmake.opt
+++ b/nmake.opt
@@ -141,7 +141,7 @@ OPTFLAGS= $(CXX_PDB_FLAGS) /nologo /MD /
@@ -489,3 +478,14 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
messages are not displayed.
<dt> <b>-st</b> <i>threshold</i>:</dt><dd>
+--- a/man/man1/ogrlineref.1
++++ b/man/man1/ogrlineref.1
+@@ -40,7 +40,7 @@ Show the usage\&.
+ .IP "\fB\fB-progress\fP:\fP" 1c
+ Show progress\&.
+ .IP "\fB\fB-quiet\fP:\fP" 1c
+-Supress all messages except errors and results\&.
++Suppress all messages except errors and results\&.
+ .IP "\fB\fB-f\fP \fIformat_name\fP:\fP" 1c
+ Select an output format name\&. The default is to create a shapefile\&.
+ .IP "\fB\fB-dsco\fP \fINAME=VALUE\fP:\fP" 1c
diff --git a/debian/patches/usefull-typo b/debian/patches/usefull-typo
index c7afcc1..9bceb47 100644
--- a/debian/patches/usefull-typo
+++ b/debian/patches/usefull-typo
@@ -5,7 +5,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/NEWS
+++ b/NEWS
-@@ -2920,7 +2920,7 @@ Port:
+@@ -3037,7 +3037,7 @@ Port:
- /vsitar/ : to read in .tar or .tgz/.tar.gz files
* Add C API to create ZIP files
* Add support for writable /vsizip/
@@ -14,7 +14,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
doing backward seeks by a few bytes on underlying file handles for which
backwardseeks are very slow, such as GZip handle
* Add service for base64 decoding
-@@ -2938,7 +2938,7 @@ Port:
+@@ -3055,7 +3055,7 @@ Port:
Core:
* RFC 24: progressive/async raster reading
* On Unix, add capability of opening the target of a symlink through GDALOpen()
@@ -23,7 +23,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
GDAL virtual filenames in software offering only file explorers (#3902)
* Assume anything less than 100000 for GDAL_CACHEMAX is measured in metabytes.
* Read cartesian coordinates if applicable in GDALLoadOziMapFile().
-@@ -3358,7 +3358,7 @@ Core:
+@@ -3475,7 +3475,7 @@ Core:
* Add OGRLayer::GetName() and OGRLayer::GetGeomType() virtual methods,
and their C and SWIG mappings (#3719)
* On Unix, add capability of opening the target of a symlink through OGROpen()
@@ -32,7 +32,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
GDAL virtual filenames in software offering only file explorers (#3902)
* Expat based XML readers : add support for reading files with Windows-1252
encoding
-@@ -3628,7 +3628,7 @@ PostgreSQL driver:
+@@ -3745,7 +3745,7 @@ PostgreSQL driver:
is set to YES
* If the PG_USE_BASE64 configuration option is set to YES, geometries will be
requested as BASE64 encoded EWKB instead of canonical HEX encoded EWKB.
@@ -99,7 +99,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
/* sub-windows of data on a large /vsicurl dataset). */
CPLErr GTiffRasterBand::DirectIO( GDALRWFlag eRWFlag,
-@@ -8667,7 +8667,7 @@ TIFF *GTiffDataset::CreateLL( const char
+@@ -8681,7 +8681,7 @@ TIFF *GTiffDataset::CreateLL( const char
}
/* Set the compression method before asking the default strip size */
@@ -108,7 +108,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
/* the default strip size is 8 or 16 depending on the photometric value */
TIFFSetField( hTIFF, TIFFTAG_COMPRESSION, nCompression );
-@@ -9155,7 +9155,7 @@ GTiffDataset::CreateCopy( const char * p
+@@ -9169,7 +9169,7 @@ GTiffDataset::CreateCopy( const char * p
#endif
/* Note: JPEG_DIRECT_COPY is not defined by default, because it is mainly */
@@ -196,21 +196,21 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* matching if no exact matching is possible.
--- a/man/man1/ogr2ogr.1
+++ b/man/man1/ogr2ogr.1
-@@ -89,7 +89,7 @@ Layer creation option (format specific)
+@@ -86,7 +86,7 @@ Layer creation option (format specific)
.IP "\fB\fB-nln\fP\fI name\fP:\fP" 1c
Assign an alternate name to the new layer
.IP "\fB\fB-nlt\fP\fI type\fP:\fP" 1c
--Define the geometry type for the created layer. One of NONE, GEOMETRY, POINT, LINESTRING, POLYGON, GEOMETRYCOLLECTION, MULTIPOINT, MULTIPOLYGON or MULTILINESTRING. Add '25D' to the name to get 2.5D versions. Starting with GDAL 1.10, PROMOTE_TO_MULTI can be used to automatically promote layers that mix polygon or multipolygons to multipolygons, and layers that mix linestrings or multilinestrings to multilinestrings. Can be usefull when converting shapefiles to PostGIS (and other target d [...]
-+Define the geometry type for the created layer. One of NONE, GEOMETRY, POINT, LINESTRING, POLYGON, GEOMETRYCOLLECTION, MULTIPOINT, MULTIPOLYGON or MULTILINESTRING. Add '25D' to the name to get 2.5D versions. Starting with GDAL 1.10, PROMOTE_TO_MULTI can be used to automatically promote layers that mix polygon or multipolygons to multipolygons, and layers that mix linestrings or multilinestrings to multilinestrings. Can be useful when converting shapefiles to PostGIS (and other target dr [...]
+-Define the geometry type for the created layer\&. One of NONE, GEOMETRY, POINT, LINESTRING, POLYGON, GEOMETRYCOLLECTION, MULTIPOINT, MULTIPOLYGON or MULTILINESTRING\&. Add '25D' to the name to get 2\&.5D versions\&. Starting with GDAL 1\&.10, PROMOTE_TO_MULTI can be used to automatically promote layers that mix polygon or multipolygons to multipolygons, and layers that mix linestrings or multilinestrings to multilinestrings\&. Can be usefull when converting shapefiles to PostGIS (and ot [...]
++Define the geometry type for the created layer\&. One of NONE, GEOMETRY, POINT, LINESTRING, POLYGON, GEOMETRYCOLLECTION, MULTIPOINT, MULTIPOLYGON or MULTILINESTRING\&. Add '25D' to the name to get 2\&.5D versions\&. Starting with GDAL 1\&.10, PROMOTE_TO_MULTI can be used to automatically promote layers that mix polygon or multipolygons to multipolygons, and layers that mix linestrings or multilinestrings to multilinestrings\&. Can be useful when converting shapefiles to PostGIS (and oth [...]
.IP "\fB\fB-dim\fP\fI val\fP:\fP" 1c
- (starting with GDAL 1.10) Force the coordinate dimension to val (valid values are 2 or 3). This affects both the layer geometry type, and feature geometries. Starting with GDAL 1.11, the value can be set to 'layer_dim' to instruct feature geometries to be promoted to the coordinate dimension declared by the layer.
+ (starting with GDAL 1\&.10) Force the coordinate dimension to val (valid values are 2 or 3)\&. This affects both the layer geometry type, and feature geometries\&. Starting with GDAL 1\&.11, the value can be set to 'layer_dim' to instruct feature geometries to be promoted to the coordinate dimension declared by the layer\&.
.IP "\fB\fB-a_srs\fP\fI srs_def\fP:\fP" 1c
-@@ -155,7 +155,7 @@ To be combined with -splitlistfields to
+@@ -152,7 +152,7 @@ To be combined with -splitlistfields to
.IP "\fB\fB-fieldmap\fP:\fP" 1c
- (starting with GDAL 1.10.0) Specifies the list of field indexes to be copied from the source to the destination. The (n)th value specified in the list is the index of the field in the target layer definition in which the n(th) field of the source layer must be copied. Index count starts at zero. There must be exactly as many values in the list as the count of the fields in the source layer. We can use the 'identity' setting to specify that the fields should be transferred by using the s [...]
+ (starting with GDAL 1\&.10\&.0) Specifies the list of field indexes to be copied from the source to the destination\&. The (n)th value specified in the list is the index of the field in the target layer definition in which the n(th) field of the source layer must be copied\&. Index count starts at zero\&. There must be exactly as many values in the list as the count of the fields in the source layer\&. We can use the 'identity' setting to specify that the fields should be transferred by [...]
.IP "\fB\fB-addfields\fP:\fP" 1c
--(starting with GDAL 1.11) This is a specialized version of -append. Contrary to -append, -addfields has the effect of adding, to existing target layers, the new fields found in source layers. This option is usefull when merging files that have non-strictly identical structures. This might not work for output formats that don't support adding fields to existing non-empty layers.
-+(starting with GDAL 1.11) This is a specialized version of -append. Contrary to -append, -addfields has the effect of adding, to existing target layers, the new fields found in source layers. This option is useful when merging files that have non-strictly identical structures. This might not work for output formats that don't support adding fields to existing non-empty layers.
+-(starting with GDAL 1\&.11) This is a specialized version of -append\&. Contrary to -append, -addfields has the effect of adding, to existing target layers, the new fields found in source layers\&. This option is usefull when merging files that have non-strictly identical structures\&. This might not work for output formats that don't support adding fields to existing non-empty layers\&.
++(starting with GDAL 1\&.11) This is a specialized version of -append\&. Contrary to -append, -addfields has the effect of adding, to existing target layers, the new fields found in source layers\&. This option is useful when merging files that have non-strictly identical structures\&. This might not work for output formats that don't support adding fields to existing non-empty layers\&.
.PP
.SH "PERFORMANCE HINTS"
.PP
@@ -579,12 +579,12 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/man/man1/gdal_edit.1
+++ b/man/man1/gdal_edit.1
-@@ -27,7 +27,7 @@ It works only with raster formats that s
- Gives a brief usage message for the generic GDAL commandline options and exit.
+@@ -24,7 +24,7 @@ It works only with raster formats that s
+ Gives a brief usage message for the generic GDAL commandline options and exit\&.
.PP
.IP "\fB\fB-ro\fP:\fP" 1c
--(GDAL >= 1.11) Open the dataset in read-only. Might be usefull for drivers refusing to use the dataset in update-mode. In which case, updated information will go into PAM .aux.xml files.
-+(GDAL >= 1.11) Open the dataset in read-only. Might be useful for drivers refusing to use the dataset in update-mode. In which case, updated information will go into PAM .aux.xml files.
+-(GDAL >= 1\&.11) Open the dataset in read-only\&. Might be usefull for drivers refusing to use the dataset in update-mode\&. In which case, updated information will go into PAM \&.aux\&.xml files\&.
++(GDAL >= 1\&.11) Open the dataset in read-only\&. Might be useful for drivers refusing to use the dataset in update-mode\&. In which case, updated information will go into PAM \&.aux\&.xml files\&.
.PP
.IP "\fB\fB-a_srs\fP \fIsrs_def\fP:\fP" 1c
.PP
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git
More information about the Pkg-grass-devel
mailing list