[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6
Bas Couwenberg
sebastic at xs4all.nl
Mon Oct 14 03:20:25 UTC 2013
The following commit has been merged in the master branch:
commit 3bd143c0b06cf5b504b1c664157768d8784a57ab
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Oct 11 17:01:24 2013 +0200
Add patches to fix various typos.
diff --git a/debian/changelog b/debian/changelog
index e7f09bb..d3024d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
* Use canonical URLs for Vcs-* fields.
* Update copyright.
* Refer to quilt instead of dpatch, and fix typos in README.source.
+ * Add patches to fix various typos.
-- Bas Couwenberg <sebastic at xs4all.nl> Thu, 03 Oct 2013 23:19:27 +0200
diff --git a/debian/libgdal1h.lintian-overrides b/debian/libgdal1h.lintian-overrides
new file mode 100644
index 0000000..b63a7b1
--- /dev/null
+++ b/debian/libgdal1h.lintian-overrides
@@ -0,0 +1,2 @@
+# False positive on: {136, "Socialist Republic of Viet Nam"},
+libgdal1h: spelling-error-in-binary usr/lib/libgdal.so.1.17.1 Nam Name
diff --git a/debian/patches/accomodate-typo b/debian/patches/accomodate-typo
new file mode 100644
index 0000000..bd48e26
--- /dev/null
+++ b/debian/patches/accomodate-typo
@@ -0,0 +1,234 @@
+--- a/NEWS
++++ b/NEWS
+@@ -3106,7 +3106,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)
+- * Avoid precaching other bands if block cache size is not big enough to accomodate them (#2838)
++ * Avoid precaching other bands if block cache size is not big enough to accommodate them (#2838)
+ * Internal libtiff (4.0.0beta5) and libgeotiff (1.3.0beta) upgraded
+ * use the SetCitationToSRS call for the PCSCitationGeoKey in a similar fashion to the GTCitationGeoKey (#2933)
+ * NBITS set for GTiffOddBits. YCbCr JPEG added as a compression type.
+--- a/frmts/grib/degrib18/g2clib-1.0.4/simpack.c
++++ b/frmts/grib/degrib18/g2clib-1.0.4/simpack.c
+@@ -112,7 +112,7 @@ void simpack(g2float *fld,g2int ndpts,g2
+ else if (nbits!=0 && idrstmpl[1]==0) {
+ //
+ // Use minimum number of bits specified by user and
+- // adjust binary scaling factor to accomodate data.
++ // adjust binary scaling factor to accommodate data.
+ //
+ rmin=rmin*dscale;
+ rmax=rmax*dscale;
+--- a/frmts/gtiff/geotiff.cpp
++++ b/frmts/gtiff/geotiff.cpp
+@@ -1188,7 +1188,7 @@ CPLErr GTiffRasterBand::FillCacheForOthe
+ /* and O(nBands^2) performance ! */
+ /* */
+ /* If there are many bands and the block cache size is not big */
+-/* enough to accomodate the size of all the blocks, don't enter */
++/* enough to accommodate the size of all the blocks, don't enter */
+ /* -------------------------------------------------------------------- */
+ if( poGDS->nBands != 1 && !poGDS->bLoadingOtherBands &&
+ nBlockXSize * nBlockYSize * (GDALGetDataTypeSize(eDataType) / 8) < GDALGetCacheMax64() / poGDS->nBands)
+--- a/frmts/gtiff/gt_wkt_srs.cpp
++++ b/frmts/gtiff/gt_wkt_srs.cpp
+@@ -487,7 +487,7 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIF
+ && psDefn->UOMLengthInMeters != 1.0 )
+ {
+ psDefn->ProjParm[iParm] /= psDefn->UOMLengthInMeters;
+- CPLDebug( "GTIFF", "converting geokey to accomodate old broken file due to GTIFF_LINEAR_UNITS=BROKEN setting." );
++ CPLDebug( "GTIFF", "converting geokey to accommodate old broken file due to GTIFF_LINEAR_UNITS=BROKEN setting." );
+ }
+ break;
+
+--- a/frmts/gtiff/libtiff/tif_getimage.c
++++ b/frmts/gtiff/libtiff/tif_getimage.c
+@@ -2541,7 +2541,7 @@ PickContigCase(TIFFRGBAImage* img)
+ * must always be <= horizontal subsampling; so
+ * there are only a few possibilities and we just
+ * enumerate the cases.
+- * Joris: added support for the [1,2] case, nonetheless, to accomodate
++ * Joris: added support for the [1,2] case, nonetheless, to accommodate
+ * some OJPEG files
+ */
+ uint16 SubsamplingHor;
+--- a/frmts/gtiff/libtiff/tif_ojpeg.c
++++ b/frmts/gtiff/libtiff/tif_ojpeg.c
+@@ -141,7 +141,7 @@
+ * OJPEG_BUFFER: Define the size of the desired buffer here. Should be small enough so as to guarantee
+ * instant processing, optimal streaming and optimal use of processor cache, but also big
+ * enough so as to not result in significant call overhead. It should be at least a few
+- * bytes to accomodate some structures (this is verified in asserts), but it would not be
++ * bytes to accommodate some structures (this is verified in asserts), but it would not be
+ * sensible to make it this small anyway, and it should be at most 64K since it is indexed
+ * with uint16. We recommend 2K.
+ * EGYPTIANWALK: You could also define EGYPTIANWALK here, but it is not used anywhere and has
+--- a/man/man1/gdalwarp.1
++++ b/man/man1/gdalwarp.1
+@@ -125,7 +125,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.
+ .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 georeferenced units 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
+@@ -337,7 +337,7 @@ void OGR_G_GetPoint( OGRGeometryH hGeom,
+ *
+ * If iPoint is larger than the number of existing
+ * points in the linestring, the point count will be increased to
+- * accomodate the request.
++ * accommodate the request.
+ *
+ * @param hGeom handle to the geometry to add a vertex to.
+ * @param i the index of the vertex to assign (zero based) or
+@@ -395,7 +395,7 @@ void OGR_G_SetPoint( OGRGeometryH hGeom,
+ *
+ * If iPoint is larger than the number of existing
+ * points in the linestring, the point count will be increased to
+- * accomodate the request.
++ * accommodate the request.
+ *
+ * @param hGeom handle to the geometry to add a vertex to.
+ * @param i the index of the vertex to assign (zero based) or
+--- a/ogr/ogrlinestring.cpp
++++ b/ogr/ogrlinestring.cpp
+@@ -355,7 +355,7 @@ void OGRLineString::setNumPoints( int nN
+ *
+ * If iPoint is larger than the number of necessary the number of existing
+ * points in the line string, the point count will be increased to
+- * accomodate the request.
++ * accommodate the request.
+ *
+ * There is no SFCOM analog to this method.
+ *
+@@ -381,7 +381,7 @@ void OGRLineString::setPoint( int iPoint
+ *
+ * If iPoint is larger than the number of necessary the number of existing
+ * points in the line string, the point count will be increased to
+- * accomodate the request.
++ * accommodate the request.
+ *
+ * There is no SFCOM analog to this method.
+ *
+--- a/ogr/ogrsf_frmts/avc/avc_e00write.c
++++ b/ogr/ogrsf_frmts/avc/avc_e00write.c
+@@ -78,7 +78,7 @@
+ * Accept '-' cahracter in new coverage name
+ *
+ * Revision 1.6 2000/01/10 02:57:44 daniel
+- * Little changes to accomodate read support for "weird" coverages
++ * Little changes to accommodate read support for "weird" coverages
+ *
+ * Revision 1.5 1999/12/24 07:18:34 daniel
+ * Added PC Arc/Info coverages support
+--- a/ogr/ogrsf_frmts/shape/drv_shapefile.html
++++ b/ogr/ogrsf_frmts/shape/drv_shapefile.html
+@@ -155,7 +155,7 @@ the datasource ExecuteSQL() method.</p>
+ <h2>Field sizes</h2>
+
+ <p>Starting with GDAL/OGR 1.10, the driver knows to auto-extend string and integer fields
+-(up to the 255 bytes limit imposed by the DBF format) to dynamically accomodate for
++(up to the 255 bytes limit imposed by the DBF format) to dynamically accommodate for
+ the length of the data to be inserted.</p>
+
+ <p>It is also possible to force a resize of the fields to the optimal width by issuing a
+--- a/swig/include/php/gdal_php.i
++++ b/swig/include/php/gdal_php.i
+@@ -7,7 +7,7 @@
+ /*
+ * $Log$
+ * Revision 1.1 2005/09/02 16:19:23 kruland
+- * Major reorganization to accomodate multiple language bindings.
++ * Major reorganization to accommodate multiple language bindings.
+ * Each language binding can define renames and supplemental code without
+ * having to have a lot of conditionals in the main interface definition files.
+ *
+--- a/swig/include/php/ogr_php.i
++++ b/swig/include/php/ogr_php.i
+@@ -7,7 +7,7 @@
+ /*
+ * $Log$
+ * Revision 1.1 2005/09/02 16:19:23 kruland
+- * Major reorganization to accomodate multiple language bindings.
++ * Major reorganization to accommodate multiple language bindings.
+ * Each language binding can define renames and supplemental code without
+ * having to have a lot of conditionals in the main interface definition files.
+ *
+--- a/swig/include/ruby/gdal_ruby.i
++++ b/swig/include/ruby/gdal_ruby.i
+@@ -10,7 +10,7 @@
+ * Copied over code from the Python version of gdal_ruby.i. Will have to port the code to Ruby.
+ *
+ * Revision 1.1 2005/09/02 16:19:23 kruland
+- * Major reorganization to accomodate multiple language bindings.
++ * Major reorganization to accommodate multiple language bindings.
+ * Each language binding can define renames and supplemental code without
+ * having to have a lot of conditionals in the main interface definition files.
+ *
+--- a/swig/include/ruby/ogr_ruby.i
++++ b/swig/include/ruby/ogr_ruby.i
+@@ -16,7 +16,7 @@
+ * Added support for exceptions, removed some outdated code.
+ *
+ * Revision 1.1 2005/09/02 16:19:23 kruland
+- * Major reorganization to accomodate multiple language bindings.
++ * Major reorganization to accommodate multiple language bindings.
+ * Each language binding can define renames and supplemental code without
+ * having to have a lot of conditionals in the main interface definition files.
+ *
+--- a/swig/include/ruby/typemaps_ruby.i
++++ b/swig/include/ruby/typemaps_ruby.i
+@@ -39,7 +39,7 @@
+ * Significantly updated typemaps for Ruby - resynced with the Python typemaps file.
+ *
+ * Revision 1.5 2005/09/02 16:19:23 kruland
+- * Major reorganization to accomodate multiple language bindings.
++ * Major reorganization to accommodate multiple language bindings.
+ * Each language binding can define renames and supplemental code without
+ * having to have a lot of conditionals in the main interface definition files.
+ *
+--- a/swig/java/javadoc.java
++++ b/swig/java/javadoc.java
+@@ -9103,7 +9103,7 @@ public class Geometry:public void SetCoo
+ * <p>
+ * If ipoint is larger than the number of existing
+ * points in the linestring, the point count will be increased to
+- * accomodate the request.
++ * accommodate the request.
+ *
+ * @param ipoint the index of the vertex to assign (zero based) or
+ * zero for a point.
+@@ -9117,7 +9117,7 @@ public class Geometry:public void SetPoi
+ * <p>
+ * If ipoint is larger than the number of existing
+ * points in the linestring, the point count will be increased to
+- * accomodate the request.
++ * accommodate the request.
+ *
+ * @param ipoint the index of the vertex to assign (zero based) or
+ * zero for a point.
+@@ -9132,7 +9132,7 @@ public class Geometry:public void SetPoi
+ * <p>
+ * If ipoint is larger than the number of existing
+ * points in the linestring, the point count will be increased to
+- * accomodate the request.
++ * accommodate the request.
+ *
+ * @param ipoint the index of the vertex to assign (zero based) or
+ * zero for a point.
+--- a/apps/gdalwarp.cpp
++++ b/apps/gdalwarp.cpp
+@@ -204,7 +204,7 @@ Set the color interpretation of the band
+
+ 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
++be modified to accommodate new data, so you may have to remove it in that case, or
+ use the -overwrite option.
+
+ Polygon cutlines may be used as a mask to restrict the area of the destination file
diff --git a/debian/patches/algoritm-typo b/debian/patches/algoritm-typo
new file mode 100644
index 0000000..71e1462
--- /dev/null
+++ b/debian/patches/algoritm-typo
@@ -0,0 +1,34 @@
+--- a/swig/include/Operations.i
++++ b/swig/include/Operations.i
+@@ -447,7 +447,7 @@ int wrapper_GridCreate( char* algorithmO
+
+ if ( eErr != CE_None )
+ {
+- CPLError( eErr, CPLE_AppDefined, "Failed to process algoritm name and parameters.\n" );
++ CPLError( eErr, CPLE_AppDefined, "Failed to process algorithm name and parameters.\n" );
+ return eErr;
+ }
+
+--- a/alg/gdalgrid.cpp
++++ b/alg/gdalgrid.cpp
+@@ -2032,17 +2032,17 @@ GDALGridCreate( GDALGridAlgorithm eAlgor
+ /* defaults. */
+ /************************************************************************/
+
+-CPLErr ParseAlgorithmAndOptions( const char *pszAlgoritm,
++CPLErr ParseAlgorithmAndOptions( const char *pszAlgorithm,
+ GDALGridAlgorithm *peAlgorithm,
+ void **ppOptions )
+ {
+- CPLAssert( pszAlgoritm );
++ CPLAssert( pszAlgorithm );
+ CPLAssert( peAlgorithm );
+ CPLAssert( ppOptions );
+
+ *ppOptions = NULL;
+
+- char **papszParms = CSLTokenizeString2( pszAlgoritm, ":", FALSE );
++ char **papszParms = CSLTokenizeString2( pszAlgorithm, ":", FALSE );
+
+ if ( CSLCount(papszParms) < 1 )
+ return CE_Failure;
diff --git a/debian/patches/bandwith-typo b/debian/patches/bandwith-typo
new file mode 100644
index 0000000..b51afaf
--- /dev/null
+++ b/debian/patches/bandwith-typo
@@ -0,0 +1,11 @@
+--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
++++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
+@@ -444,7 +444,7 @@ int OGRSQLiteDataSource::OpenOrCreateDB(
+ {
+ CPLError( CE_Failure, CPLE_OpenFailed, "%s",
+ "A trigger and/or view calls a OGR extension SQL function that could be used to "
+- "steal data, or use network bandwith, without your consent.\n"
++ "steal data, or use network bandwidth, without your consent.\n"
+ "The database will not be opened unless the ALLOW_OGR_SQL_FUNCTIONS_FROM_TRIGGER_AND_VIEW "
+ "configuration option to YES.");
+ return FALSE;
diff --git a/debian/patches/consistant-typo b/debian/patches/consistant-typo
new file mode 100644
index 0000000..8376736
--- /dev/null
+++ b/debian/patches/consistant-typo
@@ -0,0 +1,373 @@
+--- a/NEWS
++++ b/NEWS
+@@ -1149,7 +1149,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
+- * Add warning if a target filename extension isn't consistant with the output driver
++ * Add warning if a target filename extension isn't consistent with the output driver
+ * Add --pause for convenient debugging, document it and --locale
+
+ Multi-driver topics:
+@@ -1607,7 +1607,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
+- * ogr2ogr: add a warning if the target filename has an extension or a prefix that isn't consistant with the default output format (i.e. Shapefile), but which matches another driver. Can be made quiet with -q option
++ * ogr2ogr: add a warning if the target filename has an extension or a prefix that isn't consistent with the default output format (i.e. Shapefile), but which matches another driver. Can be made quiet with -q option
+ * ogrinfo/ogr2ogr: exit when SetAttributeFilter() fails, instead of silently going on (#4261)
+
+ Multi driver topics:
+@@ -2113,7 +2113,7 @@ Utilities :
+ to align on a standard grid (#3772)
+
+ AAIGRID driver:
+- * Cast nodata value to float to be consistant with precision of pixel data in
++ * Cast nodata value to float to be consistent with precision of pixel data in
+ 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)
+@@ -2220,7 +2220,7 @@ GTX driver:
+ * Read NOAA .gtx vertical datum shift files.
+
+ GXF driver:
+- * Cast nodata value to float to be consistant with precision of pixel data in
++ * Cast nodata value to float to be consistent with precision of pixel data in
+ GDT_Float32 case
+ * Introduce a GXF_DATATYPE configuration option that can be set to Float64
+ * Use GDALGetScanline() instead of GDALGetRawScanline() so that #SENS
+@@ -2453,7 +2453,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
+- to operate on various geometry types, and to be consistant with PostGIS
++ to operate on various geometry types, and to be consistent with PostGIS
+ ST_Centroid() capabilities and the underlying GEOS method
+ * Make the GetStyleTable() SetStyleTable() SetStyleTableDirectly() methods on
+ datasources and layers virtual (#2978)
+@@ -3544,7 +3544,7 @@ General:
+ osr.ImportFromMICoordSys(), osr.ExportToMICoordSys(), SpatialReference.Clone()
+ osr.EPSGTreatsAsLatLong(), osr.ImportFromEPSGA()
+ * Make resampling an optionnal parameter for gdal.RegenerateOverview(),
+- to be consistant with gdal.RegenerateOverviews()
++ to be consistent with gdal.RegenerateOverviews()
+ * NONNULL checks have been added to check various arguments of methods
+ * add missing constants : DCAP_VIRTUALIO, color interpretations, OGR constants
+
+@@ -3723,7 +3723,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)
+- * ogr2ogr: Output error messages on stderr to be consistant; Make error message about failed reprojection more clearer (hopefully); Advertize the use of -skipfailures in error message (#2588)
++ * ogr2ogr: Output error messages on stderr to be consistent; Make error message about failed reprojection more clearer (hopefully); Advertize the use of -skipfailures in error message (#2588)
+ * nearblack: Add support for scanning from top and bottom as well as from the sides.
+ * Prevent crash in gdalwarpsimple utility and in GDALSimpleImageWarp() when source dataset has no raster band
+ * gdal_rasterize: check that coordinates systems match (Ticket #1937)
+--- a/alg/gdaltransformer.cpp
++++ b/alg/gdaltransformer.cpp
+@@ -775,7 +775,7 @@ retry:
+
+
+ /* -------------------------------------------------------------------- */
+-/* Recompute some bounds so that all return values are consistant */
++/* Recompute some bounds so that all return values are consistent */
+ /* -------------------------------------------------------------------- */
+ dfMaxXOut = dfMinXOut + (*pnPixels) * dfPixelSizeX;
+ dfMinYOut = dfMaxYOut - (*pnLines) * dfPixelSizeY;
+--- a/apps/commonutils.cpp
++++ b/apps/commonutils.cpp
+@@ -36,7 +36,7 @@ CPL_CVSID("$Id: commonutils.cpp 25416 20
+ /* -------------------------------------------------------------------- */
+ /* CheckExtensionConsistency() */
+ /* */
+-/* Check that the target file extension is consistant with the */
++/* Check that the target file extension is consistent with the */
+ /* requested driver. Actually, we only warn in cases where the */
+ /* inconsistency is blatant (use of an extension declared by one */
+ /* or several drivers, and not by the selected one) */
+--- a/apps/nearblack.cpp
++++ b/apps/nearblack.cpp
+@@ -184,7 +184,7 @@ int main( int argc, char ** argv )
+
+ CSLDestroy( papszTokens );
+
+- /***** check if the number of bands is consistant *****/
++ /***** check if the number of bands is consistent *****/
+
+ if ( oColors.size() > 0 &&
+ oColors.front().size() != oColor.size() )
+--- a/apps/testreprojmulti.cpp
++++ b/apps/testreprojmulti.cpp
+@@ -65,7 +65,7 @@ void ReprojFunc(void* unused)
+ memcpy(padfResultY, padfRefY, 1024 * sizeof(double));
+ poCT->TransformEx( 1024, padfResultX, padfResultY, NULL, NULL );
+
+- /* Check that the results are consistant with the reference results */
++ /* Check that the results are consistent with the reference results */
+ assert(memcmp(padfResultX, padfRefResultX, 1024 * sizeof(double)) == 0);
+ assert(memcmp(padfResultY, padfRefResultY, 1024 * sizeof(double)) == 0);
+
+--- a/frmts/bsb/bsb_read.c
++++ b/frmts/bsb/bsb_read.c
+@@ -643,7 +643,7 @@ static int BSBReadHeaderLine( BSBInfo *p
+ /* BSBSeekAndCheckScanlineNumber() */
+ /* */
+ /* Seek to the beginning of the scanline and check that the */
+-/* scanline number in file is consistant with what we expect */
++/* scanline number in file is consistent with what we expect */
+ /* */
+ /* @param nScanline zero based line number */
+ /************************************************************************/
+@@ -768,7 +768,7 @@ int BSBReadScanline( BSBInfo *psInfo, in
+
+ /* -------------------------------------------------------------------- */
+ /* Seek to the beginning of the scanline and check that the */
+-/* scanline number in file is consistant with what we expect */
++/* scanline number in file is consistent with what we expect */
+ /* -------------------------------------------------------------------- */
+ if ( !BSBSeekAndCheckScanlineNumber(psInfo, nScanline, TRUE) )
+ {
+--- a/frmts/nitf/nitfdataset.cpp
++++ b/frmts/nitf/nitfdataset.cpp
+@@ -3563,7 +3563,7 @@ CPLErr NITFDataset::ReadJPEGBlock( int i
+ if( poDS->GetRasterBand(1)->GetRasterDataType() != GetRasterBand(1)->GetRasterDataType())
+ {
+ CPLError( CE_Failure, CPLE_AppDefined,
+- "JPEG block %d data type (%s) not consistant with band data type (%s).",
++ "JPEG block %d data type (%s) not consistent with band data type (%s).",
+ iBlock, GDALGetDataTypeName(poDS->GetRasterBand(1)->GetRasterDataType()),
+ GDALGetDataTypeName(GetRasterBand(1)->GetRasterDataType()) );
+ delete poDS;
+--- a/frmts/nitf/nitfimage.c
++++ b/frmts/nitf/nitfimage.c
+@@ -3300,7 +3300,7 @@ static void NITFLoadLocationTable( NITFI
+ }
+ else
+ {
+- CPLDebug("NITF", "The CoverageSectionSubheader content isn't consistant");
++ CPLDebug("NITF", "The CoverageSectionSubheader content isn't consistent");
+ bFoundValidLocation = FALSE;
+ break;
+ }
+@@ -3313,7 +3313,7 @@ static void NITFLoadLocationTable( NITFI
+ }
+ else
+ {
+- CPLDebug("NITF", "The VQ tables content aren't consistant");
++ CPLDebug("NITF", "The VQ tables content aren't consistent");
+ bFoundValidLocation = FALSE;
+ break;
+ }
+--- a/gcore/gdalpamrasterband.cpp
++++ b/gcore/gdalpamrasterband.cpp
+@@ -998,7 +998,7 @@ PamParseHistogram( CPLXMLNode *psHistIte
+ if( strlen(pszHistCounts) < 2 * (size_t)(*pnBuckets) -1 )
+ {
+ CPLError(CE_Failure, CPLE_AppDefined,
+- "HistCounts content isn't consistant with BucketCount value");
++ "HistCounts content isn't consistent with BucketCount value");
+ return FALSE;
+ }
+
+--- a/ogr/ogrsf_frmts/generic/ogr_gensql.cpp
++++ b/ogr/ogrsf_frmts/generic/ogr_gensql.cpp
+@@ -882,7 +882,7 @@ OGRFeature *OGRGenSQLResultsLayer::Trans
+
+ // If joining a (primary) numeric column with a (secondary) string column
+ // then add implicit casting of the secondary column to numeric. This behaviour
+- // worked in GDAL < 1.8, and it is consistant with how sqlite behaves too. See #4321
++ // worked in GDAL < 1.8, and it is consistent with how sqlite behaves too. See #4321
+ // For the reverse case, joining a string column with a numeric column, the
+ // string constant will be cast to float by SWQAutoConvertStringToNumeric (#4259)
+ if( eSecondaryFieldType == OFTString &&
+--- a/ogr/ogrsf_frmts/generic/ogrunionlayer.cpp
++++ b/ogr/ogrsf_frmts/generic/ogrunionlayer.cpp
+@@ -459,13 +459,13 @@ void OGRUnionLayer::AutoWarpLayerIfNeces
+ (poSRS != NULL && poSRS2 == NULL) )
+ {
+ CPLError(CE_Warning, CPLE_AppDefined,
+- "SRS of layer %s not consistant with layer SRS",
++ "SRS of layer %s not consistent with layer SRS",
+ papoSrcLayers[iLayer]->GetName());
+ }
+ else if (poSRS != NULL && poSRS2 != NULL &&
+ poSRS != poSRS2 && !poSRS->IsSame(poSRS2))
+ {
+- CPLDebug("VRT", "SRS of layer %s not consistant with layer SRS. "
++ CPLDebug("VRT", "SRS of layer %s not consistent with layer SRS. "
+ "Trying auto warping",
+ papoSrcLayers[iLayer]->GetName());
+ OGRCoordinateTransformation* poCT =
+--- a/ogr/ogrsf_frmts/gml/drv_gml.html
++++ b/ogr/ogrsf_frmts/gml/drv_gml.html
+@@ -105,7 +105,7 @@ When reading a feature, the driver will
+ last recognized GML geometry found (in case they are multiples) in the XML subtree describing the feature.<p>
+
+ Starting with OGR 1.10, in case of multiple geometry occurences, if a geometry is in a <geometry> element,
+-this will be the one selected. This will make default behaviour consistant with Inspire objects.<p>
++this will be the one selected. This will make default behaviour consistent with Inspire objects.<p>
+
+ Starting with OGR 1.8.0, the user can change the .gfs file to select the appropriate
+ geometry by specifying its path with the <GeometryElementPath> element. See the
+--- a/ogr/ogrsf_frmts/idrisi/ogridrisilayer.cpp
++++ b/ogr/ogrsf_frmts/idrisi/ogridrisilayer.cpp
+@@ -160,7 +160,7 @@ int OGRIdrisiLayer::Detect_AVL_ADC(const
+ if( pszRecords == NULL || atoi(pszRecords) != (int)nTotalFeatures )
+ {
+ CPLDebug("IDRISI", ".adc file found, but 'records' not found or not "
+- "consistant with feature number declared in .vdc");
++ "consistent with feature number declared in .vdc");
+ CSLDestroy( papszADC );
+ return FALSE;
+ }
+--- a/ogr/ogrsf_frmts/shape/sbnsearch.c
++++ b/ogr/ogrsf_frmts/shape/sbnsearch.c
+@@ -684,7 +684,7 @@ static int SBNSearchDiskInternal( Search
+ #ifdef sanity_checks
+ /* -------------------------------------------------------------------- */
+ /* Those tests only check that the shape bounding box in the bin */
+-/* are consistant (self-consistant and consistant with the node */
++/* are consistent (self-consistent and consistent with the node */
+ /* they are attached to). They are optional however (as far as */
+ /* the safety of runtime is concerned at least). */
+ /* -------------------------------------------------------------------- */
+--- a/ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp
++++ b/ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp
+@@ -1089,7 +1089,7 @@ OGRFeature *OGRWFSLayer::GetNextFeature(
+ poBaseLayer = poBaseDS->GetLayer(0);
+ poBaseLayer->ResetReading();
+
+- /* Check that the layer field definition is consistant with the one */
++ /* Check that the layer field definition is consistent with the one */
+ /* we got in BuildLayerDefn() */
+ if (poFeatureDefn->GetFieldCount() != poBaseLayer->GetLayerDefn()->GetFieldCount())
+ bGotApproximateLayerDefn = TRUE;
+--- a/port/cpl_csv.cpp
++++ b/port/cpl_csv.cpp
+@@ -462,7 +462,7 @@ char CSVDetectSeperator (const char* psz
+ chDelimiter = *pszLine;
+ else if (chDelimiter != *pszLine)
+ {
+- /* The separator is not consistant on the line. */
++ /* The separator is not consistent on the line. */
+ CPLDebug("CSV", "Inconsistent separator. '%c' and '%c' found. Using ',' as default",
+ chDelimiter, *pszLine);
+ chDelimiter = ',';
+--- a/swig/include/gdal_array.i
++++ b/swig/include/gdal_array.i
+@@ -622,9 +622,9 @@ def BandReadAsArray( band, xoff = 0, yof
+ shape_buf_xsize = buf_obj.shape[2]
+ shape_buf_ysize = buf_obj.shape[1]
+ if buf_xsize is not None and buf_xsize != shape_buf_xsize:
+- raise ValueError('Specified buf_xsize not consistant with array shape')
++ raise ValueError('Specified buf_xsize not consistent with array shape')
+ if buf_ysize is not None and buf_ysize != shape_buf_ysize:
+- raise ValueError('Specified buf_ysize not consistant with array shape')
++ raise ValueError('Specified buf_ysize not consistent with array shape')
+ buf_xsize = shape_buf_xsize
+ buf_ysize = shape_buf_ysize
+
+--- a/swig/java/javadoc.java
++++ b/swig/java/javadoc.java
+@@ -2235,7 +2235,7 @@ public class Dataset:public int ReadRast
+ * <a href="../gdalconst/gdalconstConstants.html#GDT_Byte">gdalconstConstants.GDT_Byte</a>,
+ * <a href="../gdalconst/gdalconstConstants.html#GDT_Int16">gdalconstConstants.GDT_Int16</a>, ...
+ * The pixel values will automatically be translated to/from the Band
+- * data type as needed. The GDAL type must be consistant with the type of the Java array.
++ * data type as needed. The GDAL type must be consistent with the type of the Java array.
+ *
+ * @param array The array into which the data will be written. This buffer must contain at least
+ * buf_xsize * buf_ysize elements * nBandCount . It is organized
+@@ -2496,7 +2496,7 @@ public class Dataset:public int WriteRas
+ * <a href="../gdalconst/gdalconstConstants.html#GDT_Byte">gdalconstConstants.GDT_Byte</a>,
+ * <a href="../gdalconst/gdalconstConstants.html#GDT_Int16">gdalconstConstants.GDT_Int16</a>, ...
+ * The pixel values will automatically be translated to/from the Band
+- * data type as needed. The GDAL type must be consistant with the type of the Java array.
++ * data type as needed. The GDAL type must be consistent with the type of the Java array.
+ *
+ * @param array The array from which the data will be read. This buffer must contain at least
+ * buf_xsize * buf_ysize elements * nBandCount . It is organized
+@@ -3639,7 +3639,7 @@ public class Band:public java.nio.ByteBu
+ * <a href="../gdalconst/gdalconstConstants.html#GDT_Byte">gdalconstConstants.GDT_Byte</a>,
+ * <a href="../gdalconst/gdalconstConstants.html#GDT_Int16">gdalconstConstants.GDT_Int16</a>, ...
+ * The pixel values will automatically be translated to/from the Band
+- * data type as needed. The GDAL type must be consistant with the type of the Java array.
++ * data type as needed. The GDAL type must be consistent with the type of the Java array.
+ *
+ * @param array The buffer into which the data should be read.
+ * This buffer must contain at least buf_xsize *
+@@ -4045,7 +4045,7 @@ public class Band:public int WriteRaster
+ * <a href="../gdalconst/gdalconstConstants.html#GDT_Byte">gdalconstConstants.GDT_Byte</a>,
+ * <a href="../gdalconst/gdalconstConstants.html#GDT_Int16">gdalconstConstants.GDT_Int16</a>, ...
+ * The pixel values will automatically be translated to/from the Band
+- * data type as needed. The GDAL type must be consistant with the type of the Java array.
++ * data type as needed. The GDAL type must be consistent with the type of the Java array.
+ *
+ * @param array The buffer into which the data should be read.
+ * This buffer must contain at least buf_xsize *
+--- a/swig/python/osgeo/gdal_array.py
++++ b/swig/python/osgeo/gdal_array.py
+@@ -208,9 +208,9 @@ def BandReadAsArray( band, xoff = 0, yof
+ shape_buf_xsize = buf_obj.shape[2]
+ shape_buf_ysize = buf_obj.shape[1]
+ if buf_xsize is not None and buf_xsize != shape_buf_xsize:
+- raise ValueError('Specified buf_xsize not consistant with array shape')
++ raise ValueError('Specified buf_xsize not consistent with array shape')
+ if buf_ysize is not None and buf_ysize != shape_buf_ysize:
+- raise ValueError('Specified buf_ysize not consistant with array shape')
++ raise ValueError('Specified buf_ysize not consistent with array shape')
+ buf_xsize = shape_buf_xsize
+ buf_ysize = shape_buf_ysize
+
+--- a/ogr/ogrsf_frmts/gml/gmlfeatureclass.cpp
++++ b/ogr/ogrsf_frmts/gml/gmlfeatureclass.cpp
+@@ -55,7 +55,7 @@ GMLFeatureClass::GMLFeatureClass( const
+ m_nGeometryIndex = -1;
+
+ m_pszSRSName = NULL;
+- m_bSRSNameConsistant = TRUE;
++ m_bSRSNameConsistent = TRUE;
+ }
+
+ /************************************************************************/
+@@ -291,7 +291,7 @@ int GMLFeatureClass::GetExtents( double
+ void GMLFeatureClass::SetSRSName( const char* pszSRSName )
+
+ {
+- m_bSRSNameConsistant = TRUE;
++ m_bSRSNameConsistent = TRUE;
+ CPLFree(m_pszSRSName);
+ m_pszSRSName = (pszSRSName) ? CPLStrdup(pszSRSName) : NULL;
+ }
+@@ -303,7 +303,7 @@ void GMLFeatureClass::SetSRSName( const
+ void GMLFeatureClass::MergeSRSName( const char* pszSRSName )
+
+ {
+- if(!m_bSRSNameConsistant)
++ if(!m_bSRSNameConsistent)
+ return;
+
+ if( m_pszSRSName == NULL )
+@@ -313,9 +313,9 @@ void GMLFeatureClass::MergeSRSName( cons
+ }
+ else
+ {
+- m_bSRSNameConsistant = pszSRSName != NULL &&
++ m_bSRSNameConsistent = pszSRSName != NULL &&
+ strcmp(m_pszSRSName, pszSRSName) == 0;
+- if (!m_bSRSNameConsistant)
++ if (!m_bSRSNameConsistent)
+ {
+ CPLFree(m_pszSRSName);
+ m_pszSRSName = NULL;
+--- a/ogr/ogrsf_frmts/gml/gmlreader.h
++++ b/ogr/ogrsf_frmts/gml/gmlreader.h
+@@ -122,7 +122,7 @@ class CPL_DLL GMLFeatureClass
+ int m_nGeometryIndex;
+
+ char *m_pszSRSName;
+- int m_bSRSNameConsistant;
++ int m_bSRSNameConsistent;
+
+ public:
+ GMLFeatureClass( const char *pszName = "" );
diff --git a/debian/patches/developement-typo b/debian/patches/developement-typo
new file mode 100644
index 0000000..86b949d
--- /dev/null
+++ b/debian/patches/developement-typo
@@ -0,0 +1,22 @@
+--- a/NEWS
++++ b/NEWS
+@@ -224,7 +224,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)
+- * Add frmts/vrt to CONFIG_CFLAGS for developement version of gdal-config (needed for postgis 2.0 compilation)
++ * Add frmts/vrt to CONFIG_CFLAGS for development version of gdal-config (needed for postgis 2.0 compilation)
+ * Fix compilation failure with iconv on FreeBSD (#4525)
+ * Make FileGDBAPI detection work with FileGDBAPI v1.1 and v1.2 (#4570)
+ * Fix build on Gentoo with its custom zlib 1.2.6 with the OF macro removed
+--- a/frmts/gtiff/libtiff/tif_ojpeg.c
++++ b/frmts/gtiff/libtiff/tif_ojpeg.c
+@@ -39,7 +39,7 @@
+ OF THIS SOFTWARE.
+
+ Joris Van Damme and/or AWare Systems may be available for custom
+- developement. If you like what you see, and need anything similar or related,
++ development. If you like what you see, and need anything similar or related,
+ contact <info at awaresystems.be>.
+ */
+
diff --git a/debian/patches/explicitely-typo b/debian/patches/explicitely-typo
new file mode 100644
index 0000000..ff94f92
--- /dev/null
+++ b/debian/patches/explicitely-typo
@@ -0,0 +1,678 @@
+--- a/NEWS
++++ b/NEWS
+@@ -752,7 +752,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/
+- * Support specifying connection string as 'filename.gml,xsd=some_filename.xsd' to explicitely provide a XSD
++ * Support specifying connection string as 'filename.gml,xsd=some_filename.xsd' to explicitly provide a XSD
+ * 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)
+@@ -1553,7 +1553,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)
+- * OGR SQL: OGRGenSQLResultsLayer: if the dialect is explicitely set to OGRSQL, don't propagate the WHERE clause of the SELECT to the source layer, but evaluate it instead at the OGRGenSQLResultsLayer level (#4022)
++ * OGR SQL: OGRGenSQLResultsLayer: if the dialect is explicitly set to OGRSQL, don't propagate the WHERE clause of the SELECT to the source layer, but evaluate it instead at the OGRGenSQLResultsLayer level (#4022)
+ * OGR SQL: Avoid error emission on requests such as 'SELECT MIN(EAS_ID), COUNT(*) FROM POLY'
+ * OGR SQL: Avoid setting width/precision for AVG column
+ * OGR SQL: Add a mechanism to delete a layer (DROP TABLE x)
+--- a/apps/gdal_rasterize.cpp
++++ b/apps/gdal_rasterize.cpp
+@@ -340,7 +340,7 @@ GDALDatasetH CreateOutputDataset(std::ve
+ }
+
+ /* When rasterizing point layers and that the bounds have */
+- /* not been explicitely set, voluntary increase the extent by */
++ /* not been explicitly set, voluntary increase the extent by */
+ /* a half-pixel size to avoid missing points on the border */
+ if (wkbFlatten(OGR_L_GetGeomType(hLayer)) == wkbPoint &&
+ !bTargetAlignedPixels && dfXRes != 0 && dfYRes != 0)
+@@ -478,7 +478,7 @@ int main( int argc, char ** argv )
+ double dfXRes = 0, dfYRes = 0;
+ int bCreateOutput = FALSE;
+ const char* pszFormat = "GTiff";
+- int bFormatExplicitelySet = FALSE;
++ int bFormatExplicitlySet = FALSE;
+ char **papszCreateOptions = NULL;
+ GDALDriverH hDriver = NULL;
+ GDALDataType eOutputType = GDT_Float64;
+@@ -606,7 +606,7 @@ int main( int argc, char ** argv )
+ else if( EQUAL(argv[i],"-of") && i < argc-1 )
+ {
+ pszFormat = argv[++i];
+- bFormatExplicitelySet = TRUE;
++ bFormatExplicitlySet = TRUE;
+ bCreateOutput = TRUE;
+ }
+ else if( EQUAL(argv[i],"-init") && i < argc - 1 )
+@@ -858,7 +858,7 @@ int main( int argc, char ** argv )
+ exit( 1 );
+ }
+
+- if (!bQuiet && !bFormatExplicitelySet)
++ if (!bQuiet && !bFormatExplicitlySet)
+ CheckExtensionConsistency(pszDstFilename, pszFormat);
+ }
+ else
+--- a/frmts/ctg/ctgdataset.cpp
++++ b/frmts/ctg/ctgdataset.cpp
+@@ -361,7 +361,7 @@ int CTGDataset::Identify( GDALOpenInfo *
+
+ GDALOpenInfo* poOpenInfoToDelete = NULL;
+ /* GZipped grid_cell.gz files are common, so automagically open them */
+- /* if the /vsigzip/ has not been explicitely passed */
++ /* if the /vsigzip/ has not been explicitly passed */
+ const char* pszFilename = CPLGetFilename(poOpenInfo->pszFilename);
+ if ((EQUAL(pszFilename, "grid_cell.gz") ||
+ EQUAL(pszFilename, "grid_cell1.gz") ||
+@@ -432,7 +432,7 @@ GDALDataset *CTGDataset::Open( GDALOpenI
+ CPLString osFilename(poOpenInfo->pszFilename);
+
+ /* GZipped grid_cell.gz files are common, so automagically open them */
+- /* if the /vsigzip/ has not been explicitely passed */
++ /* if the /vsigzip/ has not been explicitly passed */
+ const char* pszFilename = CPLGetFilename(poOpenInfo->pszFilename);
+ if ((EQUAL(pszFilename, "grid_cell.gz") ||
+ EQUAL(pszFilename, "grid_cell1.gz") ||
+--- a/frmts/ecw/ecwasyncreader.cpp
++++ b/frmts/ecw/ecwasyncreader.cpp
+@@ -280,7 +280,7 @@ NCSEcwReadStatus ECWAsyncReader::Refresh
+ poReader->bComplete = TRUE;
+ }
+
+- /* Call CPLCleanupTLS explicitely since this thread isn't managed */
++ /* Call CPLCleanupTLS explicitly since this thread isn't managed */
+ /* by CPL. This will free the ressources taken by the above CPLDebug */
+ if( poReader->bComplete )
+ CPLCleanupTLS();
+--- a/frmts/hf2/hf2dataset.cpp
++++ b/frmts/hf2/hf2dataset.cpp
+@@ -330,7 +330,7 @@ int HF2Dataset::Identify( GDALOpenInfo *
+
+ GDALOpenInfo* poOpenInfoToDelete = NULL;
+ /* GZipped .hf2 files are common, so automagically open them */
+- /* if the /vsigzip/ has not been explicitely passed */
++ /* if the /vsigzip/ has not been explicitly passed */
+ CPLString osFilename(poOpenInfo->pszFilename);
+ if ((EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "hfz") ||
+ (strlen(poOpenInfo->pszFilename) > 6 &&
+@@ -374,7 +374,7 @@ GDALDataset *HF2Dataset::Open( GDALOpenI
+
+ GDALOpenInfo* poOpenInfoToDelete = NULL;
+ /* GZipped .hf2 files are common, so automagically open them */
+- /* if the /vsigzip/ has not been explicitely passed */
++ /* if the /vsigzip/ has not been explicitly passed */
+ CPLString osFilename(poOpenInfo->pszFilename);
+ if ((EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "hfz") ||
+ (strlen(poOpenInfo->pszFilename) > 6 &&
+--- a/frmts/jpeg/frmt_jpeg.html
++++ b/frmts/jpeg/frmt_jpeg.html
+@@ -40,7 +40,7 @@ compressed tiles.<p>
+
+ To be able to read and write JPEG images with 12-bit sample, you can build GDAL
+ with its internal libjpeg (based on IJG libjpeg-6b, with additional changes for 12-bit
+-sample support), or explicitely pass --with-jpeg12=yes to configure script when building
++sample support), or explicitly pass --with-jpeg12=yes to configure script when building
+ with external libjpeg. See <a href="http://trac.osgeo.org/gdal/wiki/TIFF12BitJPEG">
+ "8 and 12 bit JPEG in TIFF"</a> wiki page for more details.<p>
+
+--- a/frmts/nitf/nitfdataset.cpp
++++ b/frmts/nitf/nitfdataset.cpp
+@@ -605,7 +605,7 @@ GDALDataset *NITFDataset::OpenInternal(
+ }
+ else
+ {
+- /* We explicitely list the allowed drivers to avoid hostile content */
++ /* We explicitly list the allowed drivers to avoid hostile content */
+ /* to be opened by a random driver, and also to make sure that */
+ /* a future new JPEG2000 compatible driver derives from GDALPamDataset */
+ static const char * const apszDrivers[] = { "JP2KAK", "JP2ECW", "JP2MRSID",
+@@ -4178,7 +4178,7 @@ NITFDataset::NITFCreateCopy(
+
+ if (CSLPartialFindString(papszFullOptions, "TRE=GEOLOB=") != - 1)
+ {
+- CPLDebug("NITF", "GEOLOB TRE was explicitely defined before. "
++ CPLDebug("NITF", "GEOLOB TRE was explicitly defined before. "
+ "Overriding it with current georefencing info.");
+ }
+
+@@ -4205,7 +4205,7 @@ NITFDataset::NITFCreateCopy(
+ papszFullOptions = CSLAddString( papszFullOptions, osGEOLOB ) ;
+
+ /* -------------------------------------------------------------------- */
+-/* Write GEOPSB TRE if not already explicitely provided */
++/* Write GEOPSB TRE if not already explicitly provided */
+ /* -------------------------------------------------------------------- */
+ if (CSLPartialFindString(papszFullOptions, "FILE_TRE=GEOPSB=") == -1 &&
+ CSLPartialFindString(papszFullOptions, "TRE=GEOPSB=") == -1)
+@@ -4237,7 +4237,7 @@ NITFDataset::NITFCreateCopy(
+ }
+ else
+ {
+- CPLDebug("NITF", "GEOPSB TRE was explicitely defined before. Keeping it.");
++ CPLDebug("NITF", "GEOPSB TRE was explicitly defined before. Keeping it.");
+ }
+
+ }
+--- a/frmts/pdf/frmt_pdf.html
++++ b/frmts/pdf/frmt_pdf.html
+@@ -64,9 +64,9 @@ specified, all features are rendered.</l
+ Defaults to 3.</li>
+ <li><i>GDAL_PDF_LAYERS</i> = list of layers (comma separated) to turn ON (or "ALL" to turn all layers ON).
+ The layer names can be obtained by querying the LAYERS metadata domain. When this option is specified,
+-layers not explicitely listed will be turned off.</li>
++layers not explicitly listed will be turned off.</li>
+ <li><i>GDAL_PDF_LAYERS_OFF</i> = list of layers (comma separated) to turn OFF. The layer names can be obtained by
+-querying the LAYERS metadata domain. When this option is specified, layers not explicitely listed will be turned
++querying the LAYERS metadata domain. When this option is specified, layers not explicitly listed will be turned
+ off.</li>
+ </ul>
+
+--- a/frmts/pdf/pdfdataset.cpp
++++ b/frmts/pdf/pdfdataset.cpp
+@@ -2509,7 +2509,7 @@ void PDFDataset::TurnLayersOnOff()
+ oIter->second->setState(OptionalContentGroup::On);
+ }
+
+- // Turn child layers on, unless there's one of them explicitely listed
++ // Turn child layers on, unless there's one of them explicitly listed
+ // in the list.
+ size_t nLen = strlen(papszLayers[i]);
+ int bFoundChildLayer = FALSE;
+@@ -4968,7 +4968,7 @@ CPLErr PDFDataset::SetGeoTransform(doubl
+ bGeoTransformValid = TRUE;
+ bProjDirty = TRUE;
+
+- /* Reset NEATLINE if not explicitely set by the user */
++ /* Reset NEATLINE if not explicitly set by the user */
+ if (!bNeatLineDirty)
+ SetMetadataItem("NEATLINE", NULL);
+ return CE_None;
+@@ -5140,7 +5140,7 @@ CPLErr PDFDataset::SetGCPs( int nGCPCoun
+
+ bProjDirty = TRUE;
+
+- /* Reset NEATLINE if not explicitely set by the user */
++ /* Reset NEATLINE if not explicitly set by the user */
+ if (!bNeatLineDirty)
+ SetMetadataItem("NEATLINE", NULL);
+
+--- a/frmts/xyz/xyzdataset.cpp
++++ b/frmts/xyz/xyzdataset.cpp
+@@ -314,7 +314,7 @@ int XYZDataset::IdentifyEx( GDALOpenInfo
+
+ GDALOpenInfo* poOpenInfoToDelete = NULL;
+ /* GZipped .xyz files are common, so automagically open them */
+- /* if the /vsigzip/ has not been explicitely passed */
++ /* if the /vsigzip/ has not been explicitly passed */
+ if (strlen(poOpenInfo->pszFilename) > 6 &&
+ EQUAL(poOpenInfo->pszFilename + strlen(poOpenInfo->pszFilename) - 6, "xyz.gz") &&
+ !EQUALN(poOpenInfo->pszFilename, "/vsigzip/", 9))
+@@ -446,7 +446,7 @@ GDALDataset *XYZDataset::Open( GDALOpenI
+ CPLString osFilename(poOpenInfo->pszFilename);
+
+ /* GZipped .xyz files are common, so automagically open them */
+- /* if the /vsigzip/ has not been explicitely passed */
++ /* if the /vsigzip/ has not been explicitly passed */
+ if (strlen(poOpenInfo->pszFilename) > 6 &&
+ EQUAL(poOpenInfo->pszFilename + strlen(poOpenInfo->pszFilename) - 6, "xyz.gz") &&
+ !EQUALN(poOpenInfo->pszFilename, "/vsigzip/", 9))
+--- a/gcore/gdaldataset.cpp
++++ b/gcore/gdaldataset.cpp
+@@ -2346,7 +2346,7 @@ GDALDatasetH GDALOpenInternal( GDALOpenI
+ * Starting with GDAL 1.6.0, if GDALOpenShared() is called on the same pszFilename
+ * from two different threads, a different GDALDataset object will be returned as
+ * it is not safe to use the same dataset from different threads, unless the user
+- * does explicitely use mutexes in its code.
++ * does explicitly use mutexes in its code.
+ *
+ * For drivers supporting the VSI virtual file API, it is possible to open
+ * a file in a .zip archive (see VSIInstallZipFileHandler()), in a .tar/.tar.gz/.tgz archive
+--- a/ogr/ogrsf_frmts/generic/ogr_gensql.cpp
++++ b/ogr/ogrsf_frmts/generic/ogr_gensql.cpp
+@@ -134,7 +134,7 @@ OGRGenSQLResultsLayer::OGRGenSQLResultsL
+ poSrcLayer = papoTableLayers[0];
+
+ /* -------------------------------------------------------------------- */
+-/* If the user has explicitely requested a OGRSQL dialect, then */
++/* If the user has explicitly requested a OGRSQL dialect, then */
+ /* we should avoid to forward the where clause to the source layer */
+ /* when there is a risk it cannot understand it (#4022) */
+ /* -------------------------------------------------------------------- */
+--- a/ogr/ogrsf_frmts/gml/drv_gml.html
++++ b/ogr/ogrsf_frmts/gml/drv_gml.html
+@@ -289,7 +289,7 @@ the layers must be read in the order the
+ If no .xsd and .gfs files are found, the parser will detect the layout of layers when
+ building the .gfs file. If the layers are found to be sequential, a <i><SequentialLayers>true</SequentialLayers></i>
+ element will be written in the .gfs file, so that the GML_READ_MODE will be automatically
+-initialized to MONOBLOCK_LAYERS if not explicitely set by the user.<p>
++initialized to MONOBLOCK_LAYERS if not explicitly set by the user.<p>
+
+ Starting with OGR 1.9.0, the GML_READ_MODE configuration option can be set to INTERLEAVED_LAYERS to be able
+ to read a GML file whose features from different layers are interleaved. In the case, the semantics of the
+--- a/ogr/ogrsf_frmts/gpx/drv_gpx.html
++++ b/ogr/ogrsf_frmts/gpx/drv_gpx.html
+@@ -275,7 +275,7 @@ ogr2ogr -f GPX output.gpx input.shp -sql
+ <li>How to solve "ERROR 6: Cannot create GPX layer XXXXXX with unknown geometry type" ?<p>
+ This error happens when the layer to create does not expose a precise geometry type, but just a generic
+ wkbUnknown type. This is for example the case when using ogr2ogr with a SQL request to a PostgreSQL datasource.
+-You must then explicitely specify -nlt POINT (or LINESTRING or MULTILINESTRING).
++You must then explicitly specify -nlt POINT (or LINESTRING or MULTILINESTRING).
+ </li>
+
+
+--- a/ogr/ogrsf_frmts/mdb/drv_mdb.html
++++ b/ogr/ogrsf_frmts/mdb/drv_mdb.html
+@@ -47,7 +47,7 @@
+ <li>If you didn't specify --with-jvm-lib-add-rpath at configure time, set the path of the directory that contains libjvm.so in LD_LIBRARY_PATH or in /etc/ld.so.conf.</li>
+ <li>Download jackcess-1.2.2.jar, commons-lang-2.4.jar and commons-logging-1.1.1.jar (other versions might work)</li>
+ <li>Put the 3 JARs either in the lib/ext directory of the JRE (e.g. /usr/lib/jvm/java-6-openjdk/jre/lib/ext) or in another directory
+- and explicitely point them with the CLASSPATH environment variable.</li>
++ and explicitly point them with the CLASSPATH environment variable.</li>
+ </ol>
+
+ <h2>Resources</h2>
+--- a/ogr/ogrsf_frmts/ogrsf_frmts.dox
++++ b/ogr/ogrsf_frmts/ogrsf_frmts.dox
+@@ -911,7 +911,7 @@ success.
+ @param poSpatialFilter geometry which represents a spatial filter. Can be NULL.
+ @param pszDialect allows control of the statement dialect. If set to NULL, the
+ OGR SQL engine will be used, except for RDBMS drivers that will use their dedicated SQL engine,
+-unless OGRSQL is explicitely passed as the dialect. Starting with OGR 1.10, the SQLITE dialect
++unless OGRSQL is explicitly passed as the dialect. Starting with OGR 1.10, the SQLITE dialect
+ can also be used.
+
+ @return an OGRLayer containing the results of the query. Deallocate with
+@@ -949,7 +949,7 @@ can also be used.
+ @param hSpatialFilter handle to a geometry which represents a spatial filter. Can be NULL.
+ @param pszDialect allows control of the statement dialect. If set to NULL, the
+ OGR SQL engine will be used, except for RDBMS drivers that will use their dedicated SQL engine,
+-unless OGRSQL is explicitely passed as the dialect. Starting with OGR 1.10, the SQLITE dialect
++unless OGRSQL is explicitly passed as the dialect. Starting with OGR 1.10, the SQLITE dialect
+ can also be used.
+
+ @return an handle to a OGRLayer containing the results of the query.
+--- a/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
++++ b/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
+@@ -3928,7 +3928,7 @@ OGRLayer * OGROSMDataSource::ExecuteSQL(
+ poSpatialFilter,
+ pszDialect );
+
+- /* If the user explicitely run a COUNT() request, then do it ! */
++ /* If the user explicitly run a COUNT() request, then do it ! */
+ if( poResultSetLayer )
+ {
+ if( pszDialect != NULL && EQUAL(pszDialect, "SQLITE") )
+--- a/ogr/ogrsf_frmts/pg/drv_pg_advanced.html
++++ b/ogr/ogrsf_frmts/pg/drv_pg_advanced.html
+@@ -101,7 +101,7 @@ mode, will be retrieved from the databas
+ new behaviour is that you must be careful if you re-use the same feature object in a loop that makes
+ insertions. After the first iteration, the FID will be set to a non-null value, so at the second iteration,
+ CreateFeature() will try to insert the new feature with the FID of the previous feature, which will fail as
+-you cannot insert 2 features with same FID. So in that case you must explicitely reset the FID before calling CreateFeature(),
++you cannot insert 2 features with same FID. So in that case you must explicitly reset the FID before calling CreateFeature(),
+ or use a fresh feature object.<p>
+
+ Snippet example in Python :
+--- a/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h
++++ b/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h
+@@ -558,7 +558,7 @@ class OGRSQLiteDataSource : public OGRDa
+ #endif
+
+ VSILFILE* fpMainFile; /* Set by the VFS layer when it opens the DB */
+- /* Must *NOT* be closed by the datasource explicitely. */
++ /* Must *NOT* be closed by the datasource explicitly. */
+ GIntBig nFileTimestamp;
+ int bLastSQLCommandIsUpdateLayerStatistics;
+
+--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
++++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
+@@ -524,7 +524,7 @@ int OGR2SQLITE_ConnectCreate(sqlite3* hD
+
+ if( poDS->GetLayerCount() > 1 )
+ {
+- *pzErr = sqlite3_mprintf( "Datasource '%s' has more than one layers, and none was explicitely selected.",
++ *pzErr = sqlite3_mprintf( "Datasource '%s' has more than one layers, and none was explicitly selected.",
+ osDSName.c_str() );
+ poDS->Release();
+ return SQLITE_ERROR;
+--- a/ogr/ogrsf_frmts/vrt/drv_vrt.html
++++ b/ogr/ogrsf_frmts/vrt/drv_vrt.html
+@@ -117,7 +117,7 @@ If set to FALSE, the source geometry fie
+
+ <li> <b>SrcRegion</b> (optionnal, from GDAL 1.7.0) : This element is used
+ to define an initial spatial filter for the source features. This spatial
+-filter will be combined with any spatial filter explicitely set on the VRT
++filter will be combined with any spatial filter explicitly set on the VRT
+ layer with the SetSpatialFilter() method. The value of the element must be
+ a valid WKT string defining a polygon. An optional <b>clip</b> attribute
+ can be set to "TRUE" to clip the geometries to the source region, otherwise
+--- a/swig/include/cpl.i
++++ b/swig/include/cpl.i
+@@ -363,7 +363,7 @@ int VSIUnlink(const char * utf8_path );
+
+ /* Added in GDAL 1.7.0 */
+ /* Thread support is necessary for binding languages with threaded GC */
+-/* even if the user doesn't explicitely use threads */
++/* even if the user doesn't explicitly use threads */
+ %inline {
+ int wrapper_HasThreadSupport()
+ {
+--- a/swig/include/python/docs/ogr_datasource_docs.i
++++ b/swig/include/python/docs/ogr_datasource_docs.i
+@@ -171,7 +171,7 @@ filter. Can be NULL.
+
+ pszDialect: allows control of the statement dialect. If set to NULL,
+ the OGR SQL engine will be used, except for RDBMS drivers that will
+-use their dedicated SQL engine, unless OGRSQL is explicitely passed as
++use their dedicated SQL engine, unless OGRSQL is explicitly passed as
+ the dialect.
+
+ an handle to a OGRLayer containing the results of the query.
+--- a/swig/include/python/typemaps_python.i
++++ b/swig/include/python/typemaps_python.i
+@@ -685,7 +685,7 @@ CreateTupleFromDoubleArray( int *first,
+ %typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER) (char **dict)
+ {
+ /* %typecheck(SWIG_TYPECHECK_POINTER) (char **dict) */
+- /* Note: we exclude explicitely strings, because they can be considered as a sequence of characters, */
++ /* Note: we exclude explicitly strings, because they can be considered as a sequence of characters, */
+ /* which is not desirable since it makes it impossible to define bindings such as SetMetadata(string) and SetMetadata(array_of_string) */
+ /* (see #4816) */
+ $1 = ((PyMapping_Check($input) || PySequence_Check($input) ) && !SWIG_CheckState(SWIG_AsCharPtrAndSize($input, 0, NULL, 0)) ) ? 1 : 0;
+--- a/swig/java/javadoc.java
++++ b/swig/java/javadoc.java
+@@ -1336,7 +1336,7 @@ public class gdal:public static Driver G
+ * The first successful open will result in a returned dataset. If all
+ * drivers fail then null is returned.
+ * <p>
+- * It is required that you explicitely close a dataset opened in update
++ * It is required that you explicitly close a dataset opened in update
+ * mode with the Dataset.delete() method. Otherwise the data might not be
+ * flushed to the disk. Don't rely only on Java garbage collection.
+ *
+@@ -6738,7 +6738,7 @@ public class Layer:public int DeleteFeat
+ Sequential reads are generally considered interrupted by a GetFeature() call.
+ <p>
+ The returned feature will be properly handled by the Java garbage collector,
+- but you can help it by explicitely calling the
++ but you can help it by explicitly calling the
+ Feature.<a href="Feature.html#delete()">delete()</a> method.
+
+ @param fid the feature id of the feature to read.
+@@ -6870,7 +6870,7 @@ public class Layer:public int GetGeomTyp
+ ResetReading() method can be used to start at the beginning again.
+ <p>
+ The returned feature will be properly handled by the Java garbage collector,
+- but you can help it by explicitely calling the
++ but you can help it by explicitly calling the
+ Feature.<a href="Feature.html#delete()">delete()</a> method.
+
+ @return a feature, or null if no more features are available.
+@@ -7595,7 +7595,7 @@ public class Feature:public Feature Clon
+ * <p>
+ * Calling this method is not required as normal garbage collection will
+ * reclaim associated resources when the object goes out of scope.
+- * Otherwise calling delete() explicitely will help release resources sooner.
++ * Otherwise calling delete() explicitly will help release resources sooner.
+ * Don't call any method on a deleted object !
+ */
+ public class Feature:public void delete()
+@@ -8475,7 +8475,7 @@ public class Geometry:public boolean Cro
+ * <p>
+ * Calling this method is not required as normal garbage collection will
+ * reclaim associated resources when the object goes out of scope.
+- * Otherwise calling delete() explicitely will help release resources sooner.
++ * Otherwise calling delete() explicitly will help release resources sooner.
+ * Don't call any method on a deleted object !
+ */
+ public class Geometry:public void delete()
+--- a/swig/python/extensions/gdal_wrap.cpp
++++ b/swig/python/extensions/gdal_wrap.cpp
+@@ -7652,7 +7652,7 @@ SWIGINTERN PyObject *_wrap_MajorObject_S
+ if (_v) {
+ {
+ /* %typecheck(SWIG_TYPECHECK_POINTER) (char **dict) */
+- /* Note: we exclude explicitely strings, because they can be considered as a sequence of characters, */
++ /* Note: we exclude explicitly strings, because they can be considered as a sequence of characters, */
+ /* which is not desirable since it makes it impossible to define bindings such as SetMetadata(string) and SetMetadata(array_of_string) */
+ /* (see #4816) */
+ _v = ((PyMapping_Check(argv[1]) || PySequence_Check(argv[1]) ) && !SWIG_CheckState(SWIG_AsCharPtrAndSize(argv[1], 0, NULL, 0)) ) ? 1 : 0;
+--- a/swig/python/extensions/ogr_wrap.cpp
++++ b/swig/python/extensions/ogr_wrap.cpp
+@@ -18084,7 +18084,7 @@ static PyMethodDef SwigMethods[] = {
+ "\n"
+ "pszDialect: allows control of the statement dialect. If set to NULL,\n"
+ "the OGR SQL engine will be used, except for RDBMS drivers that will\n"
+- "use their dedicated SQL engine, unless OGRSQL is explicitely passed as\n"
++ "use their dedicated SQL engine, unless OGRSQL is explicitly passed as\n"
+ "the dialect.\n"
+ "\n"
+ "an handle to a OGRLayer containing the results of the query.\n"
+--- a/swig/python/osgeo/ogr.py
++++ b/swig/python/osgeo/ogr.py
+@@ -690,7 +690,7 @@ class DataSource(_object):
+
+ pszDialect: allows control of the statement dialect. If set to NULL,
+ the OGR SQL engine will be used, except for RDBMS drivers that will
+- use their dedicated SQL engine, unless OGRSQL is explicitely passed as
++ use their dedicated SQL engine, unless OGRSQL is explicitly passed as
+ the dialect.
+
+ an handle to a OGRLayer containing the results of the query.
+--- a/apps/gdal_grid.cpp
++++ b/apps/gdal_grid.cpp
+@@ -550,7 +550,7 @@ int main( int argc, char ** argv )
+ {
+ GDALDriverH hDriver;
+ const char *pszSource=NULL, *pszDest=NULL, *pszFormat = "GTiff";
+- int bFormatExplicitelySet = FALSE;
++ int bFormatExplicitlySet = FALSE;
+ char **papszLayers = NULL;
+ const char *pszBurnAttribute = NULL;
+ const char *pszWHERE = NULL, *pszSQL = NULL;
+@@ -601,7 +601,7 @@ int main( int argc, char ** argv )
+ {
+ CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
+ pszFormat = argv[++i];
+- bFormatExplicitelySet = TRUE;
++ bFormatExplicitlySet = TRUE;
+ }
+
+ else if( EQUAL(argv[i],"-q") || EQUAL(argv[i],"-quiet") )
+@@ -935,7 +935,7 @@ int main( int argc, char ** argv )
+ if ( nYSize == 0 )
+ nYSize = 256;
+
+- if (!bQuiet && !bFormatExplicitelySet)
++ if (!bQuiet && !bFormatExplicitlySet)
+ CheckExtensionConsistency(pszDest, pszFormat);
+
+ hDstDS = GDALCreate( hDriver, pszDest, nXSize, nYSize, nBands,
+--- a/apps/gdal_translate.cpp
++++ b/apps/gdal_translate.cpp
+@@ -268,7 +268,7 @@ static int ProxyMain( int argc, char **
+ int i;
+ int nRasterXSize, nRasterYSize;
+ const char *pszSource=NULL, *pszDest=NULL, *pszFormat = "GTiff";
+- int bFormatExplicitelySet = FALSE;
++ int bFormatExplicitlySet = FALSE;
+ GDALDriverH hDriver;
+ int *panBandList = NULL; /* negative value of panBandList[i] means mask band of ABS(panBandList[i]) */
+ int nBandCount = 0, bDefBands = TRUE;
+@@ -346,7 +346,7 @@ static int ProxyMain( int argc, char **
+ else if( EQUAL(argv[i],"-of") && i < argc-1 )
+ {
+ pszFormat = argv[++i];
+- bFormatExplicitelySet = TRUE;
++ bFormatExplicitlySet = TRUE;
+ }
+
+ else if( EQUAL(argv[i],"-q") || EQUAL(argv[i],"-quiet") )
+@@ -671,7 +671,7 @@ static int ProxyMain( int argc, char **
+ pfnProgress = GDALDummyProgress;
+ }
+
+- if (!bQuiet && !bFormatExplicitelySet)
++ if (!bQuiet && !bFormatExplicitlySet)
+ CheckExtensionConsistency(pszDest, pszFormat);
+
+ /* -------------------------------------------------------------------- */
+--- a/apps/gdaldem.cpp
++++ b/apps/gdaldem.cpp
+@@ -2224,7 +2224,7 @@ int main( int argc, char ** argv )
+ const char *pszDstFilename = NULL;
+ const char *pszColorFilename = NULL;
+ const char *pszFormat = "GTiff";
+- int bFormatExplicitelySet = FALSE;
++ int bFormatExplicitlySet = FALSE;
+ char **papszCreateOptions = NULL;
+
+ GDALDatasetH hSrcDataset = NULL;
+@@ -2405,7 +2405,7 @@ int main( int argc, char ** argv )
+ {
+ CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
+ pszFormat = argv[++i];
+- bFormatExplicitelySet = TRUE;
++ bFormatExplicitlySet = TRUE;
+ }
+ else if( argv[i][0] == '-' )
+ {
+@@ -2496,7 +2496,7 @@ int main( int argc, char ** argv )
+ exit( 1 );
+ }
+
+- if (!bQuiet && !bFormatExplicitelySet)
++ if (!bQuiet && !bFormatExplicitlySet)
+ CheckExtensionConsistency(pszDstFilename, pszFormat);
+
+ double dfDstNoDataValue = 0;
+--- a/apps/gdalenhance.cpp
++++ b/apps/gdalenhance.cpp
+@@ -88,7 +88,7 @@ int main( int argc, char ** argv )
+ GDALDatasetH hDataset, hOutDS;
+ int i;
+ const char *pszSource=NULL, *pszDest=NULL, *pszFormat = "GTiff";
+- int bFormatExplicitelySet = FALSE;
++ int bFormatExplicitlySet = FALSE;
+ GDALDriverH hDriver;
+ GDALDataType eOutputType = GDT_Unknown;
+ char **papszCreateOptions = NULL;
+@@ -129,7 +129,7 @@ int main( int argc, char ** argv )
+ else if( EQUAL(argv[i],"-of") && i < argc-1 )
+ {
+ pszFormat = argv[++i];
+- bFormatExplicitelySet = TRUE;
++ bFormatExplicitlySet = TRUE;
+ }
+
+ else if( EQUAL(argv[i],"-ot") && i < argc-1 )
+@@ -264,7 +264,7 @@ int main( int argc, char ** argv )
+ Usage();
+ }
+
+- if (!bQuiet && pszDest != NULL && !bFormatExplicitelySet)
++ if (!bQuiet && pszDest != NULL && !bFormatExplicitlySet)
+ CheckExtensionConsistency(pszDest, pszFormat);
+
+ /* -------------------------------------------------------------------- */
+--- a/apps/gdalwarp.cpp
++++ b/apps/gdalwarp.cpp
+@@ -335,7 +335,7 @@ int main( int argc, char ** argv )
+ {
+ GDALDatasetH hDstDS;
+ const char *pszFormat = "GTiff";
+- int bFormatExplicitelySet = FALSE;
++ int bFormatExplicitlySet = FALSE;
+ char **papszSrcFiles = NULL;
+ char *pszDstFilename = NULL;
+ int bCreateOutput = FALSE, i;
+@@ -438,7 +438,7 @@ int main( int argc, char ** argv )
+ {
+ CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
+ pszFormat = argv[++i];
+- bFormatExplicitelySet = TRUE;
++ bFormatExplicitlySet = TRUE;
+ bCreateOutput = TRUE;
+ if( EQUAL(pszFormat,"VRT") )
+ bVRT = TRUE;
+@@ -893,7 +893,7 @@ int main( int argc, char ** argv )
+
+ if( hDstDS == NULL )
+ {
+- if (!bQuiet && !bFormatExplicitelySet)
++ if (!bQuiet && !bFormatExplicitlySet)
+ CheckExtensionConsistency(pszDstFilename, pszFormat);
+
+ hDstDS = GDALWarpCreateOutput( papszSrcFiles, pszDstFilename,pszFormat,
+--- a/apps/nearblack.cpp
++++ b/apps/nearblack.cpp
+@@ -122,7 +122,7 @@ int main( int argc, char ** argv )
+ int bSetAlpha = FALSE;
+ int bSetMask = FALSE;
+ const char* pszDriverName = "HFA";
+- int bFormatExplicitelySet = FALSE;
++ int bFormatExplicitlySet = FALSE;
+ char** papszCreationOptions = NULL;
+ int bQuiet = FALSE;
+
+@@ -147,7 +147,7 @@ int main( int argc, char ** argv )
+ {
+ CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
+ pszDriverName = argv[++i];
+- bFormatExplicitelySet = TRUE;
++ bFormatExplicitlySet = TRUE;
+ }
+ else if( EQUAL(argv[i], "-white") ) {
+ bNearWhite = TRUE;
+@@ -269,7 +269,7 @@ int main( int argc, char ** argv )
+ if (hDriver == NULL)
+ exit(1);
+
+- if (!bQuiet && !bFormatExplicitelySet)
++ if (!bQuiet && !bFormatExplicitlySet)
+ CheckExtensionConsistency(pszOutFile, pszDriverName);
+
+ if (bSetAlpha)
+--- a/apps/ogr2ogr.cpp
++++ b/apps/ogr2ogr.cpp
+@@ -805,7 +805,7 @@ int main( int nArgc, char ** papszArgv )
+ {
+ int nRetCode = 0;
+ int bQuiet = FALSE;
+- int bFormatExplicitelySet = FALSE;
++ int bFormatExplicitlySet = FALSE;
+ const char *pszFormat = "ESRI Shapefile";
+ const char *pszDataSource = NULL;
+ const char *pszDestDataSource = NULL;
+@@ -899,7 +899,7 @@ int main( int nArgc, char ** papszArgv )
+ else if( EQUAL(papszArgv[iArg],"-f") )
+ {
+ CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
+- bFormatExplicitelySet = TRUE;
++ bFormatExplicitlySet = TRUE;
+ pszFormat = papszArgv[++iArg];
+ }
+ else if( EQUAL(papszArgv[iArg],"-dsco") )
+@@ -1478,7 +1478,7 @@ int main( int nArgc, char ** papszArgv )
+ /* -------------------------------------------------------------------- */
+ if( !bUpdate )
+ {
+- if (!bQuiet && !bFormatExplicitelySet)
++ if (!bQuiet && !bFormatExplicitlySet)
+ CheckDestDataSourceNameConsistency(pszDestDataSource, pszFormat);
+
+ OGRSFDriverRegistrar *poR = OGRSFDriverRegistrar::GetRegistrar();
+--- a/ogr/ogrsf_frmts/filegdb/FGdbDatasource.cpp
++++ b/ogr/ogrsf_frmts/filegdb/FGdbDatasource.cpp
+@@ -457,7 +457,7 @@ OGRLayer * FGdbDataSource::ExecuteSQL( c
+ CPLDebug("FGDB", "Support for SELECT is known to be partially "
+ "non-compliant with FileGDB SDK API v1.2.\n"
+ "So for now, we use default OGR SQL engine. "
+- "Explicitely specify -dialect FileGDB\n"
++ "Explicitly specify -dialect FileGDB\n"
+ "to use the SQL engine from the FileGDB SDK API");
+ return OGRDataSource::ExecuteSQL( pszSQLCommand,
+ poSpatialFilter,
diff --git a/debian/patches/inconsistant-typo b/debian/patches/inconsistant-typo
new file mode 100644
index 0000000..2358fc6
--- /dev/null
+++ b/debian/patches/inconsistant-typo
@@ -0,0 +1,203 @@
+--- a/frmts/grib/degrib18/degrib/metaname.cpp
++++ b/frmts/grib/degrib18/degrib/metaname.cpp
+@@ -838,7 +838,7 @@ GRIB2ParmTable MeteoAtmos[] = {
+ /* 18 */ {"SNFALB", "Snow free albedo", "%", UC_NONE},
+ };
+
+-/* GRIB2 Code table 4.2 : 0.253 or 0.190 (Document is inconsistant.) */
++/* GRIB2 Code table 4.2 : 0.253 or 0.190 (Document is inconsistent.) */
+ GRIB2ParmTable MeteoText[] = {
+ /* 0 */ {"", "Arbitrary text string", "CCITTIA5", UC_NONE},
+ };
+--- a/frmts/grib/degrib18/degrib/tdlpack.cpp
++++ b/frmts/grib/degrib18/degrib/tdlpack.cpp
+@@ -175,7 +175,7 @@ static int ReadTDLPSect1 (uChar *pds, sI
+ t_hour = li_temp - t_day * 100;
+ if ((t_year != year) || (t_month != month) || (t_day != day) ||
+ (t_hour != hour)) {
+- errSprintf ("Error Inconsistant Times in ReadTDLPSect1.\n");
++ errSprintf ("Error Inconsistent Times in ReadTDLPSect1.\n");
+ return -1;
+ }
+ if (ParseTime (&(pdsMeta->refTime), year, month, day, hour, min, 0) != 0) {
+@@ -232,10 +232,10 @@ static int ReadTDLPSect1 (uChar *pds, sI
+ project_hr = GRIB_UNSIGN_INT2 (*pds, pds[1]);
+ tau = pdsMeta->ID3 - ((pdsMeta->ID3 / 1000) * 1000);
+ if (tau != project_hr) {
+- printf ("Warning: Inconsistant Projections in hours in "
++ printf ("Warning: Inconsistent Projections in hours in "
+ "ReadTDLPSect1 (%d vs %d)\n", tau, project_hr);
+ /*
+- errSprintf ("Warning: Inconsistant Projections in hours in "
++ errSprintf ("Warning: Inconsistent Projections in hours in "
+ "ReadTDLPSect1 (%ld vs %d)\n", tau, project_hr);
+ */
+ project_hr = tau;
+@@ -634,7 +634,7 @@ int TDLP_RefTime (DataSource &fp, sInt4
+
+ if ((t_year != year) || (t_month != month) || (t_day != day) ||
+ (t_hour != hour)) {
+- errSprintf ("Error Inconsistant Times in TDLP_RefTime.\n");
++ errSprintf ("Error Inconsistent Times in TDLP_RefTime.\n");
+ return -1;
+ }
+ if (ParseTime (refTime, year, month, day, hour, min, 0) != 0) {
+--- a/frmts/mbtiles/mbtilesdataset.cpp
++++ b/frmts/mbtiles/mbtilesdataset.cpp
+@@ -1703,7 +1703,7 @@ GDALDataset* MBTilesDataset::Open(GDALOp
+ if (bHasMinMaxLevel && (nMinLevel < 0 || nMinLevel > nMaxLevel))
+ {
+ CPLError(CE_Failure, CPLE_AppDefined,
+- "Inconsistant values : min(zoom_level) = %d, max(zoom_level) = %d",
++ "Inconsistent values : min(zoom_level) = %d, max(zoom_level) = %d",
+ nMinLevel, nMaxLevel);
+ goto end;
+ }
+--- a/frmts/nitf/nitfdataset.cpp
++++ b/frmts/nitf/nitfdataset.cpp
+@@ -4270,7 +4270,7 @@ NITFDataset::NITFCreateCopy(
+ else
+ {
+ CPLError((bStrict) ? CE_Failure : CE_Warning, CPLE_NotSupported,
+- "Inconsistant ICORDS value with SRS : %s%s.\n", pszICORDS,
++ "Inconsistent ICORDS value with SRS : %s%s.\n", pszICORDS,
+ (!bStrict) ? ". Setting it to G instead" : "");
+ if (bStrict)
+ {
+--- a/frmts/nitf/nitffile.c
++++ b/frmts/nitf/nitffile.c
+@@ -2523,7 +2523,7 @@ char **NITFGenericMetadataReadTRE(char *
+ if (bError == FALSE && nTreLength > 0 && nTreOffset != nTreLength)
+ {
+ CPLError( CE_Warning, CPLE_AppDefined,
+- "Inconsistant declaration of %s TRE",
++ "Inconsistent declaration of %s TRE",
+ pszTREName );
+ }
+ if (nTreOffset < nTRESize)
+@@ -2659,7 +2659,7 @@ CPLXMLNode* NITFCreateXMLTre(NITFFile* p
+ if (bError == FALSE && nTreLength > 0 && nTreOffset != nTreLength)
+ {
+ CPLError( CE_Warning, CPLE_AppDefined,
+- "Inconsistant declaration of %s TRE",
++ "Inconsistent declaration of %s TRE",
+ pszTREName );
+ }
+ if (nTreOffset < nTRESize)
+--- a/frmts/ozi/ozidataset.cpp
++++ b/frmts/ozi/ozidataset.cpp
+@@ -601,7 +601,7 @@ GDALDataset *OZIDataset::Open( GDALOpenI
+ short nTileY = ReadShort(fp, bOzi3, nKeyInit);
+ if (i == 0 && (nW != poDS->nRasterXSize || nH != poDS->nRasterYSize))
+ {
+- CPLDebug("OZI", "zoom[%d] inconsistant dimensions for zoom level 0 : nW=%d, nH=%d, nTileX=%d, nTileY=%d, nRasterXSize=%d, nRasterYSize=%d",
++ CPLDebug("OZI", "zoom[%d] inconsistent dimensions for zoom level 0 : nW=%d, nH=%d, nTileX=%d, nTileY=%d, nRasterXSize=%d, nRasterYSize=%d",
+ i, nW, nH, nTileX, nTileY, poDS->nRasterXSize, poDS->nRasterYSize);
+ delete poDS;
+ return NULL;
+--- a/frmts/pds/pdsdataset.cpp
++++ b/frmts/pds/pdsdataset.cpp
+@@ -330,7 +330,7 @@ void PDSDataset::ParseSRS()
+ /* Calculate upper left corner of pixel in meters from the */
+ /* upper left center pixel sample/line offsets. It doesn't */
+ /* mean the defaults will work for every PDS image, as these */
+-/* values are used inconsistantly. Thus we have included */
++/* values are used inconsistently. Thus we have included */
+ /* conversion options to allow the user to override the */
+ /* documented PDS3 default. Jan. 2011, for known mapping issues */
+ /* see GDAL PDS page or mapping within ISIS3 source (USGS) */
+--- a/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
++++ b/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
+@@ -89,7 +89,7 @@ OGRShapeLayer::OGRShapeLayer( OGRShapeDa
+ nTotalShapeCount = hSHP->nRecords;
+ if( hDBF != NULL && hDBF->nRecords != nTotalShapeCount )
+ {
+- CPLDebug("Shape", "Inconsistant record number in .shp (%d) and in .dbf (%d)",
++ CPLDebug("Shape", "Inconsistent record number in .shp (%d) and in .dbf (%d)",
+ hSHP->nRecords, hDBF->nRecords);
+ }
+ }
+--- a/ogr/ogrsf_frmts/shape/sbnsearch.c
++++ b/ogr/ogrsf_frmts/shape/sbnsearch.c
+@@ -328,7 +328,7 @@ SBNSearchHandle SBNOpenDiskTree( const c
+ if ((nBinStart > 0 && nNodeShapeCount == 0) ||
+ nNodeShapeCount < 0 || nNodeShapeCount > nShapeCount)
+ {
+- hSBN->sHooks.Error( "Inconsistant shape count in bin" );
++ hSBN->sHooks.Error( "Inconsistent shape count in bin" );
+ SBNCloseDiskTree(hSBN);
+ return NULL;
+ }
+@@ -637,7 +637,7 @@ static int SBNSearchDiskInternal( Search
+ {
+ free(psNode->pabyShapeDesc);
+ psNode->pabyShapeDesc = NULL;
+- hSBN->sHooks.Error( "Inconsistant shape count for bin" );
++ hSBN->sHooks.Error( "Inconsistent shape count for bin" );
+ return FALSE;
+ }
+
+@@ -737,7 +737,7 @@ static int SBNSearchDiskInternal( Search
+ {
+ free(psNode->pabyShapeDesc);
+ psNode->pabyShapeDesc = NULL;
+- hSBN->sHooks.Error( "Inconsistant shape count for bin" );
++ hSBN->sHooks.Error( "Inconsistent shape count for bin" );
+ return FALSE;
+ }
+
+--- a/ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp
++++ b/ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp
+@@ -2454,7 +2454,7 @@ OGRErr OGRWFSLayer::CommitTransaction()
+ if ((int)aosFIDList.size() != nGotInserted)
+ {
+ CPLError(CE_Failure, CPLE_AppDefined,
+- "Inconsistant InsertResults: did not get expected FID count");
++ "Inconsistent InsertResults: did not get expected FID count");
+ CPLDestroyXMLNode( psXML );
+ CPLHTTPDestroyResult(psResult);
+ return OGRERR_FAILURE;
+--- a/port/cpl_csv.cpp
++++ b/port/cpl_csv.cpp
+@@ -463,7 +463,7 @@ char CSVDetectSeperator (const char* psz
+ else if (chDelimiter != *pszLine)
+ {
+ /* The separator is not consistant on the line. */
+- CPLDebug("CSV", "Inconsistant separator. '%c' and '%c' found. Using ',' as default",
++ CPLDebug("CSV", "Inconsistent separator. '%c' and '%c' found. Using ',' as default",
+ chDelimiter, *pszLine);
+ chDelimiter = ',';
+ break;
+--- a/port/cpl_vsisimple.cpp
++++ b/port/cpl_vsisimple.cpp
+@@ -511,7 +511,7 @@ void VSICheckMarkerBegin(char* ptr)
+ if (memcmp(ptr, "VSIM", 4) != 0)
+ {
+ CPLError(CE_Fatal, CPLE_AppDefined,
+- "Inconsistant use of VSI memory allocation primitives for %p : %c%c%c%c",
++ "Inconsistent use of VSI memory allocation primitives for %p : %c%c%c%c",
+ ptr, ptr[0], ptr[1], ptr[2], ptr[3]);
+ }
+ }
+--- a/swig/include/cpl.i
++++ b/swig/include/cpl.i
+@@ -477,7 +477,7 @@ int wrapper_VSIFWriteL( int nLen, char *
+ {
+ if (nLen < size * memb)
+ {
+- CPLError(CE_Failure, CPLE_AppDefined, "Inconsistant buffer size with 'size' and 'memb' values");
++ CPLError(CE_Failure, CPLE_AppDefined, "Inconsistent buffer size with 'size' and 'memb' values");
+ return 0;
+ }
+ return VSIFWriteL(pBuf, size, memb, f);
+--- a/swig/python/extensions/gdal_wrap.cpp
++++ b/swig/python/extensions/gdal_wrap.cpp
+@@ -3497,7 +3497,7 @@ int wrapper_VSIFWriteL( int nLen, char *
+ {
+ if (nLen < size * memb)
+ {
+- CPLError(CE_Failure, CPLE_AppDefined, "Inconsistant buffer size with 'size' and 'memb' values");
++ CPLError(CE_Failure, CPLE_AppDefined, "Inconsistent buffer size with 'size' and 'memb' values");
+ return 0;
+ }
+ return VSIFWriteL(pBuf, size, memb, f);
diff --git a/debian/patches/initalize-typo b/debian/patches/initalize-typo
new file mode 100644
index 0000000..f2dfc2f
--- /dev/null
+++ b/debian/patches/initalize-typo
@@ -0,0 +1,44 @@
+--- a/apps/gdal_utilities.dox
++++ b/apps/gdal_utilities.dox
+@@ -1359,7 +1359,7 @@ Create an image with the pixels in all b
+ \endverbatim
+
+ 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.
++will be initialized to 0 and the third band will be initialized to 255.
+
+ \verbatim
+ % 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
+ .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.
+ .PP
+ .PP
+ .nf
+--- a/ogr/ogrsf_frmts/ili/ili2reader.cpp
++++ b/ogr/ogrsf_frmts/ili/ili2reader.cpp
+@@ -614,7 +614,7 @@ int ILI2Reader::SetupParser() {
+ {
+ char* msg = XMLString::transcode(toCatch.getMessage());
+ CPLError( CE_Failure, CPLE_AppDefined,
+- "Unable to initalize Xerces C++ based ILI2 reader. "
++ "Unable to initialize Xerces C++ based ILI2 reader. "
+ "Error message:\n%s\n", msg );
+ XMLString::release(&msg);
+
+--- a/ogr/ogrsf_frmts/tiger/ogr_tiger.h
++++ b/ogr/ogrsf_frmts/tiger/ogr_tiger.h
+@@ -82,7 +82,7 @@ const char * TigerVersionString( TigerVe
+ /*****************************************************************************/
+ /* The TigerFieldInfo and TigerRecordInfo structures hold information about */
+ /* the schema of a TIGER record type. In each layer implementation file */
+-/* there are statically initalized variables of these types that describe */
++/* there are statically initialized variables of these types that describe */
+ /* the record types associated with that layer. In the case where different */
+ /* TIGER versions have different schemas, there is a */
+ /* TigerFieldInfo/TigerRecordInfo for each version, and the constructor */
diff --git a/debian/patches/paramters-typo b/debian/patches/paramters-typo
new file mode 100644
index 0000000..375107b
--- /dev/null
+++ b/debian/patches/paramters-typo
@@ -0,0 +1,42 @@
+--- a/frmts/georaster/georaster_wrapper.cpp
++++ b/frmts/georaster/georaster_wrapper.cpp
+@@ -705,7 +705,7 @@ bool GeoRasterWrapper::Create( char* psz
+ nBandBlockSize = nBandBlockSize == 0 ? 1 : nBandBlockSize;
+
+ // -----------------------------------------------------------
+- // Blocking storage paramters
++ // Blocking storage parameters
+ // -----------------------------------------------------------
+
+ CPLString sBlocking;
+@@ -776,7 +776,7 @@ bool GeoRasterWrapper::Create( char* psz
+ }
+
+ // -----------------------------------------------------------
+- // Complete format paramters
++ // Complete format parameters
+ // -----------------------------------------------------------
+
+ if( poConnection->GetVersion() > 10 )
+--- a/ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp
++++ b/ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp
+@@ -1103,7 +1103,7 @@ CPLXMLNode* XMLSpatialReference(OGRSpati
+ const char* gridvalues[7];
+
+ /*
+- Need different default paramters for geographic and projected coordinate systems.
++ Need different default parameters for geographic and projected coordinate systems.
+ Try and use ArcGIS 10 default values.
+ */
+ // default tolerance is 1mm in the units of the coordinate system
+--- a/frmts/pcidsk/sdk/segment/cpcidskgeoref.cpp
++++ b/frmts/pcidsk/sdk/segment/cpcidskgeoref.cpp
+@@ -317,7 +317,7 @@ void CPCIDSKGeoref::WriteParameters( std
+ Load();
+
+ if( parms.size() < 17 )
+- ThrowPCIDSKException( "Did not get expected number of paramters in WriteParameters()" );
++ ThrowPCIDSKException( "Did not get expected number of parameters in WriteParameters()" );
+
+ unsigned int i;
+
diff --git a/debian/patches/ressource-typo b/debian/patches/ressource-typo
new file mode 100644
index 0000000..a377cfb
--- /dev/null
+++ b/debian/patches/ressource-typo
@@ -0,0 +1,233 @@
+--- a/NEWS
++++ b/NEWS
+@@ -1498,7 +1498,7 @@ USGSDEM driver:
+ VRT driver:
+ * Implement VRTDataset::IRasterIO() that can delegate to source Dataset::RasterIO() in particular cases
+ * Implement GetMinimum() and GetMaximum()
+- * GetFileList(): for /vsicurl/ ressources, don't actually test their existence as it can be excruciating slow
++ * GetFileList(): for /vsicurl/ resources, don't actually test their existence as it can be excruciating slow
+ * 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)
+@@ -2020,7 +2020,7 @@ Port:
+ Core:
+ * RFC 24: progressive/async raster reading
+ * On Unix, add capability of opening the target of a symlink through GDALOpen()
+- even if it not a real filename. Usefull for opening ressources expressed as
++ even if it not a real filename. Usefull for opening resources expressed as
+ 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().
+@@ -2440,7 +2440,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()
+- even if it not a real filename. Usefull for opening ressources expressed as
++ even if it not a real filename. Usefull for opening resources expressed as
+ GDAL virtual filenames in software offering only file explorers (#3902)
+ * Expat based XML readers : add support for reading files with Windows-1252
+ encoding
+--- a/frmts/ecw/ecwasyncreader.cpp
++++ b/frmts/ecw/ecwasyncreader.cpp
+@@ -281,7 +281,7 @@ NCSEcwReadStatus ECWAsyncReader::Refresh
+ }
+
+ /* Call CPLCleanupTLS explicitly since this thread isn't managed */
+- /* by CPL. This will free the ressources taken by the above CPLDebug */
++ /* by CPL. This will free the resources taken by the above CPLDebug */
+ if( poReader->bComplete )
+ CPLCleanupTLS();
+
+--- a/frmts/ecw/ecwdataset.cpp
++++ b/frmts/ecw/ecwdataset.cpp
+@@ -992,7 +992,7 @@ ECWDataset::~ECWDataset()
+
+ // bInGDALGlobalDestructor is set to TRUE by gdaldllmain.cpp/GDALDestroy() so as
+ // to avoid an issue with the ECW SDK 3.3 where the destructor of CNCSJP2File::CNCSJP2FileVector CNCSJP2File::sm_Files;
+- // static ressource allocated in NCJP2File.cpp can be called before GDALDestroy(), causing
++ // static resource allocated in NCJP2File.cpp can be called before GDALDestroy(), causing
+ // ECW SDK resources ( CNCSJP2File files ) to be closed before we get here.
+ if( poFileView != NULL &&
+ (!bIsJPEG2000 || !GDALIsInGlobalDestructor()) )
+--- a/frmts/nitf/nitffile.c
++++ b/frmts/nitf/nitffile.c
+@@ -2102,7 +2102,7 @@ static char** NITFGenericMetadataReadTRE
+ {
+ *pbError = TRUE;
+ CPLError( CE_Warning, CPLE_AppDefined,
+- "Invalid item construct in %s TRE in XML ressource",
++ "Invalid item construct in %s TRE in XML resource",
+ pszTREName );
+ break;
+ }
+@@ -2126,7 +2126,7 @@ static char** NITFGenericMetadataReadTRE
+ if (nIterations < 0)
+ {
+ CPLError( CE_Warning, CPLE_AppDefined,
+- "Invalid loop construct in %s TRE in XML ressource : "
++ "Invalid loop construct in %s TRE in XML resource : "
+ "invalid 'counter' %s",
+ pszTREName, pszCounter );
+ *pbError = TRUE;
+@@ -2147,7 +2147,7 @@ static char** NITFGenericMetadataReadTRE
+ if (NPART < 0)
+ {
+ CPLError( CE_Warning, CPLE_AppDefined,
+- "Invalid loop construct in %s TRE in XML ressource : "
++ "Invalid loop construct in %s TRE in XML resource : "
+ "invalid 'counter' %s",
+ pszTREName, "NPART" );
+ *pbError = TRUE;
+@@ -2165,7 +2165,7 @@ static char** NITFGenericMetadataReadTRE
+ if (NUMOPG < 0)
+ {
+ CPLError( CE_Warning, CPLE_AppDefined,
+- "Invalid loop construct in %s TRE in XML ressource : "
++ "Invalid loop construct in %s TRE in XML resource : "
+ "invalid 'counter' %s",
+ pszTREName, "NUMOPG" );
+ *pbError = TRUE;
+@@ -2187,7 +2187,7 @@ static char** NITFGenericMetadataReadTRE
+ if (NPAR < 0)
+ {
+ CPLError( CE_Warning, CPLE_AppDefined,
+- "Invalid loop construct in %s TRE in XML ressource : "
++ "Invalid loop construct in %s TRE in XML resource : "
+ "invalid 'counter' %s",
+ pszTREName, "NPAR" );
+ *pbError = TRUE;
+@@ -2196,7 +2196,7 @@ static char** NITFGenericMetadataReadTRE
+ if (NPARO < 0)
+ {
+ CPLError( CE_Warning, CPLE_AppDefined,
+- "Invalid loop construct in %s TRE in XML ressource : "
++ "Invalid loop construct in %s TRE in XML resource : "
+ "invalid 'counter' %s",
+ pszTREName, "NPAR0" );
+ *pbError = TRUE;
+@@ -2214,7 +2214,7 @@ static char** NITFGenericMetadataReadTRE
+ if (NPLN < 0)
+ {
+ CPLError( CE_Warning, CPLE_AppDefined,
+- "Invalid loop construct in %s TRE in XML ressource : "
++ "Invalid loop construct in %s TRE in XML resource : "
+ "invalid 'counter' %s",
+ pszTREName, "NPLN" );
+ *pbError = TRUE;
+@@ -2236,7 +2236,7 @@ static char** NITFGenericMetadataReadTRE
+ if (NXPTS < 0)
+ {
+ CPLError( CE_Warning, CPLE_AppDefined,
+- "Invalid loop construct in %s TRE in XML ressource : "
++ "Invalid loop construct in %s TRE in XML resource : "
+ "invalid 'counter' %s",
+ pszTREName, "NXPTS" );
+ *pbError = TRUE;
+@@ -2245,7 +2245,7 @@ static char** NITFGenericMetadataReadTRE
+ if (NYPTS < 0)
+ {
+ CPLError( CE_Warning, CPLE_AppDefined,
+- "Invalid loop construct in %s TRE in XML ressource : "
++ "Invalid loop construct in %s TRE in XML resource : "
+ "invalid 'counter' %s",
+ pszTREName, "NYPTS" );
+ *pbError = TRUE;
+@@ -2256,7 +2256,7 @@ static char** NITFGenericMetadataReadTRE
+ else
+ {
+ CPLError( CE_Warning, CPLE_AppDefined,
+- "Invalid loop construct in %s TRE in XML ressource : "
++ "Invalid loop construct in %s TRE in XML resource : "
+ "missing or invalid 'counter' or 'iterations' or 'formula'",
+ pszTREName );
+ *pbError = TRUE;
+@@ -2441,7 +2441,7 @@ static char** NITFGenericMetadataReadTRE
+ else
+ {
+ CPLError( CE_Warning, CPLE_AppDefined,
+- "Invalid if construct in %s TRE in XML ressource : "
++ "Invalid if construct in %s TRE in XML resource : "
+ "missing or invalid 'cond' attribute",
+ pszTREName );
+ *pbError = TRUE;
+--- a/frmts/vrt/vrtsources.cpp
++++ b/frmts/vrt/vrtsources.cpp
+@@ -207,7 +207,7 @@ CPLXMLNode *VRTSimpleSource::SerializeTo
+ if ( strstr(poDS->GetDescription(), "/vsicurl/http") != NULL ||
+ strstr(poDS->GetDescription(), "/vsicurl/ftp") != NULL )
+ {
+- /* Testing the existence of remote ressources can be excruciating */
++ /* Testing the existence of remote resources can be excruciating */
+ /* slow, so let's just suppose they exist */
+ pszRelativePath = poDS->GetDescription();
+ bRelativeToVRT = FALSE;
+@@ -469,7 +469,7 @@ void VRTSimpleSource::GetFileList(char**
+ if ( strstr(pszFilename, "/vsicurl/http") != NULL ||
+ strstr(pszFilename, "/vsicurl/ftp") != NULL )
+ {
+- /* Testing the existence of remote ressources can be excruciating */
++ /* Testing the existence of remote resources can be excruciating */
+ /* slow, so let's just suppose they exist */
+ }
+ else
+--- a/ogr/ogrsf_frmts/edigeo/drv_edigeo.html
++++ b/ogr/ogrsf_frmts/edigeo/drv_edigeo.html
+@@ -22,7 +22,7 @@ The driver must be provided with the .TH
+ read the associated .DIC, .GEO, .SCD, .QAL and .VEC files.<p>
+
+ In order the SRS of the layers to be correctly built, the IGNF file that contains
+-the defintion of IGN SRS must be placed in the directory of PROJ.4 ressource files.<p>
++the defintion of IGN SRS must be placed in the directory of PROJ.4 resource files.<p>
+
+ The whole set of files will be parsed into memory. This may be a limitation if dealing with
+ big EDIGEO exchanges.<p>
+@@ -56,7 +56,7 @@ according to the value of xxx=OBJ_OBJ_LN
+ <ul>
+ <li> <a href="http://georezo.net/wiki/main/donnees/edigeo">Introduction to the EDIGEO standard</a> (in French)
+ <li> <a href="http://georezo.net/wiki/_media/main/geomatique/norme_edigeo.zip">EDIGEO standard - AFNOR NF Z 52000</a> (in French)
+-<li> <a href="http://www.craig.fr/contenu/ressources/dossiers/pci/pdf/EDIGeO_PCI.pdf">Standard d'échange des objets du PCI selon la norme EDIGEO</a> (in French)
++<li> <a href="http://www.craig.fr/contenu/resources/dossiers/pci/pdf/EDIGeO_PCI.pdf">Standard d'échange des objets du PCI selon la norme EDIGEO</a> (in French)
+ <li> <a href="http://www.cadastre.gouv.fr">Homepage of the French Digital Cadastral Plan</a> (in French)
+ <li> <a href="http://docs.codehaus.org/pages/viewpage.action?pageId=77692976">Geotools EDIGEO module description</a> (in English)
+ <li> <a href="http://svn.geotools.org/trunk/modules/unsupported/edigeo/src/test/resources/org/geotools/data/edigeo/test-data/">Sample of EDIGEO data</a>
+--- a/ogr/ogrsf_frmts/edigeo/ogredigeodatasource.cpp
++++ b/ogr/ogrsf_frmts/edigeo/ogredigeodatasource.cpp
+@@ -271,7 +271,7 @@ int OGREDIGEODataSource::ReadGEO()
+ poSRS->importFromProj4("+proj=lcc +lat_1=44 +lat_2=49 +lat_0=46.5 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS81 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs");
+ else
+ {
+- CPLDebug("EDIGEO", "Cannot resolve %s SRS. Check that the IGNF file is in the directory of PROJ.4 ressource files", osREL.c_str());
++ CPLDebug("EDIGEO", "Cannot resolve %s SRS. Check that the IGNF file is in the directory of PROJ.4 resource files", osREL.c_str());
+ delete poSRS;
+ poSRS = NULL;
+ }
+--- a/port/cpl_vsil_curl.cpp
++++ b/port/cpl_vsil_curl.cpp
+@@ -2630,9 +2630,9 @@ char** VSICurlFilesystemHandler::ReadDir
+ * A special file handler is installed that allows reading on-the-fly of files
+ * available through HTTP/FTP web protocols, without downloading the entire file.
+ *
+- * Recognized filenames are of the form /vsicurl/http://path/to/remote/ressource or
+- * /vsicurl/ftp://path/to/remote/ressource where path/to/remote/ressource is the
+- * URL of a remote ressource.
++ * Recognized filenames are of the form /vsicurl/http://path/to/remote/resource or
++ * /vsicurl/ftp://path/to/remote/resource where path/to/remote/resource is the
++ * URL of a remote resource.
+ *
+ * Partial downloads (requires the HTTP server to support random reading) are done
+ * with a 16 KB granularity by default. If the driver detects sequential reading
+--- a/port/cpl_vsil_curl_streaming.cpp
++++ b/port/cpl_vsil_curl_streaming.cpp
+@@ -1440,9 +1440,9 @@ int VSICurlStreamingFSHandler::Stat( con
+ * be efficient. If you need efficient random access and that the server supports range
+ * dowloading, you should use the /vsicurl/ file system handler instead.
+ *
+- * Recognized filenames are of the form /vsicurl_streaming/http://path/to/remote/ressource or
+- * /vsicurl_streaming/ftp://path/to/remote/ressource where path/to/remote/ressource is the
+- * URL of a remote ressource.
++ * Recognized filenames are of the form /vsicurl_streaming/http://path/to/remote/resource or
++ * /vsicurl_streaming/ftp://path/to/remote/resource where path/to/remote/resource is the
++ * URL of a remote resource.
+ *
+ * The GDAL_HTTP_PROXY, GDAL_HTTP_PROXYUSERPWD and GDAL_PROXY_AUTH configuration options can be
+ * used to define a proxy server. The syntax to use is the one of Curl CURLOPT_PROXY,
diff --git a/debian/patches/series b/debian/patches/series
index b8f3b9a..340a3f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,17 @@ spatialite
force-ruby1.8
java.opt
java-make
+paramters-typo
+accomodate-typo
+inconsistant-typo
+consistant-typo
+explicitely-typo
+ressource-typo
+transfered-typo
+initalize-typo
+transfering-typo
+bandwith-typo
+unkown-typo
+usefull-typo
+developement-typo
+algoritm-typo
diff --git a/debian/patches/transfered-typo b/debian/patches/transfered-typo
new file mode 100644
index 0000000..dba3ff6
--- /dev/null
+++ b/debian/patches/transfered-typo
@@ -0,0 +1,44 @@
+--- a/ogr/ogrsf_frmts/generic/ogrunionlayer.h
++++ b/ogr/ogrsf_frmts/generic/ogrunionlayer.h
+@@ -94,7 +94,7 @@ class OGRUnionLayer : public OGRLayer
+ public:
+ OGRUnionLayer( const char* pszName,
+ int nSrcLayers, /* must be >= 1 */
+- OGRLayer** papoSrcLayers, /* array itself ownership always transfered, layer ownership depending on bTakeLayerOwnership */
++ OGRLayer** papoSrcLayers, /* array itself ownership always transferred, layer ownership depending on bTakeLayerOwnership */
+ int bTakeLayerOwnership);
+
+ virtual ~OGRUnionLayer();
+--- a/ogr/ogrsf_frmts/pg/drv_pg.html
++++ b/ogr/ogrsf_frmts/pg/drv_pg.html
+@@ -140,7 +140,7 @@ Ignored by CreateLayer() that uses the F
+ <!-- Little interest to advertize PG_USE_TEXT... Just to keep it mind it exists for example for debugging -->
+ <!-- <li><b>PG_USE_TEXT</b>: (GDAL >= 1.8.0) If set to "YES", geometries will be fetched as text instead of their default HEXEWKB form.</li></p> -->
+ <li><b>PG_USE_BASE64</b>: (GDAL >= 1.8.0) If set to "YES", geometries will be fetched as BASE64 encoded EWKB instead of canonical HEX encoded EWKB.
+-This reduces the amount of data to be transfered from 2 N to 1.333 N, where N is the size of EWKB data. However, it might be a
++This reduces the amount of data to be transferred from 2 N to 1.333 N, where N is the size of EWKB data. However, it might be a
+ bit slower than fetching in canonical form when the client and the server are on the same machine, so the default is NO.</li><p>
+ </ul>
+
+--- a/port/cpl_vsi_mem.cpp
++++ b/port/cpl_vsi_mem.cpp
+@@ -204,7 +204,7 @@ bool VSIMemFile::SetLength( vsi_l_offset
+ if( !bOwnData )
+ {
+ CPLError(CE_Failure, CPLE_NotSupported,
+- "Cannot extended in-memory file whose ownership was not transfered");
++ "Cannot extended in-memory file whose ownership was not transferred");
+ return false;
+ }
+
+--- a/swig/python/samples/README
++++ b/swig/python/samples/README
+@@ -28,7 +28,7 @@ gdalfilter.py Example script for applyi
+ files as an intermediate representation.
+
+ gdal_retile.py Script for restructuring data in a tree of regular tiles.
+- (transfered in swig/python/scripts)
++ (transferred in swig/python/scripts)
+
+ get_soundg.py Script to copy the SOUNDG layer from an S-57 file to
+ a Shapefile, splitting up features with MULTIPOINT
diff --git a/debian/patches/transfering-typo b/debian/patches/transfering-typo
new file mode 100644
index 0000000..481d227
--- /dev/null
+++ b/debian/patches/transfering-typo
@@ -0,0 +1,31 @@
+--- a/frmts/grib/degrib18/degrib/grib2api.c
++++ b/frmts/grib/degrib18/degrib/grib2api.c
+@@ -1081,7 +1081,7 @@ void unpk_g2ncep (sInt4 * kfildo, float
+ *ibitmap = 0;
+ }
+
+- /* Check type of original field, before transfering the memory. */
++ /* Check type of original field, before transferring the memory. */
+ myAssert (*ns5 > 20);
+ /* Check if NCEP had problems expanding the data. If so we currently
+ * abort. May need to revisit this behavior. */
+--- a/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
++++ b/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
+@@ -3464,7 +3464,7 @@ int OGROSMDataSource::TransferToDiskIfNe
+ CPLString osNewTmpDBName;
+ osNewTmpDBName = CPLGenerateTempFilename("osm_tmp_nodes");
+
+- CPLDebug("OSM", "%s too big for RAM. Transfering it onto disk in %s",
++ CPLDebug("OSM", "%s too big for RAM. Transferring it onto disk in %s",
+ osNodesFilename.c_str(), osNewTmpDBName.c_str());
+
+ if( CPLCopyFile( osNewTmpDBName, osNodesFilename ) != 0 )
+@@ -3543,7 +3543,7 @@ int OGROSMDataSource::TransferToDiskIfNe
+
+ osNewTmpDBName = CPLGenerateTempFilename("osm_tmp");
+
+- CPLDebug("OSM", "%s too big for RAM. Transfering it onto disk in %s",
++ CPLDebug("OSM", "%s too big for RAM. Transferring it onto disk in %s",
+ osTmpDBName.c_str(), osNewTmpDBName.c_str());
+
+ if( CPLCopyFile( osNewTmpDBName, osTmpDBName ) != 0 )
diff --git a/debian/patches/unkown-typo b/debian/patches/unkown-typo
new file mode 100644
index 0000000..15e2f7e
--- /dev/null
+++ b/debian/patches/unkown-typo
@@ -0,0 +1,198 @@
+--- a/apps/gdal_grid.cpp
++++ b/apps/gdal_grid.cpp
+@@ -803,7 +803,7 @@ int main( int argc, char ** argv )
+
+ else if( argv[i][0] == '-' )
+ {
+- Usage(CPLSPrintf("Unkown option name '%s'", argv[i]));
++ Usage(CPLSPrintf("Unknown option name '%s'", argv[i]));
+ }
+
+ else if( pszSource == NULL )
+--- a/apps/gdal_translate.cpp
++++ b/apps/gdal_translate.cpp
+@@ -633,7 +633,7 @@ static int ProxyMain( int argc, char **
+
+ else if( argv[i][0] == '-' )
+ {
+- Usage(CPLSPrintf("Unkown option name '%s'", argv[i]));
++ Usage(CPLSPrintf("Unknown option name '%s'", argv[i]));
+ }
+ else if( pszSource == NULL )
+ {
+--- a/apps/gdaladdo.cpp
++++ b/apps/gdaladdo.cpp
+@@ -153,7 +153,7 @@ int main( int nArgc, char ** papszArgv )
+ panBandList[nBandCount-1] = nBand;
+ }
+ else if( papszArgv[iArg][0] == '-' )
+- Usage(CPLSPrintf("Unkown option name '%s'", papszArgv[iArg]));
++ Usage(CPLSPrintf("Unknown option name '%s'", papszArgv[iArg]));
+ else if( pszFilename == NULL )
+ pszFilename = papszArgv[iArg];
+ else if( atoi(papszArgv[iArg]) > 0 )
+--- a/apps/gdalbuildvrt.cpp
++++ b/apps/gdalbuildvrt.cpp
+@@ -1427,7 +1427,7 @@ int main( int nArgc, char ** papszArgv )
+ }
+ else if ( papszArgv[iArg][0] == '-' )
+ {
+- Usage(CPLSPrintf("Unkown option name '%s'", papszArgv[iArg]));
++ Usage(CPLSPrintf("Unknown option name '%s'", papszArgv[iArg]));
+ }
+ else if( pszOutputFilename == NULL )
+ {
+--- a/apps/gdaldem.cpp
++++ b/apps/gdaldem.cpp
+@@ -2409,7 +2409,7 @@ int main( int argc, char ** argv )
+ }
+ else if( argv[i][0] == '-' )
+ {
+- Usage(CPLSPrintf("Unkown option name '%s'", argv[i]));
++ Usage(CPLSPrintf("Unknown option name '%s'", argv[i]));
+ }
+ else if( pszSrcFilename == NULL )
+ {
+--- a/apps/gdalinfo.c
++++ b/apps/gdalinfo.c
+@@ -162,7 +162,7 @@ int main( int argc, char ** argv )
+ nSubdataset = atoi(argv[++i]);
+ }
+ else if( argv[i][0] == '-' )
+- Usage(CPLSPrintf("Unkown option name '%s'", argv[i]));
++ Usage(CPLSPrintf("Unknown option name '%s'", argv[i]));
+ else if( pszFilename == NULL )
+ pszFilename = argv[i];
+ else
+--- a/apps/gdalserver.c
++++ b/apps/gdalserver.c
+@@ -574,7 +574,7 @@ int main(int argc, char* argv[])
+ else if( EQUAL(argv[i], "-daemonize") )
+ ;
+ else if( argv[i][0] == '-' )
+- Usage(CPLSPrintf("Unkown option name '%s'", argv[i]));
++ Usage(CPLSPrintf("Unknown option name '%s'", argv[i]));
+ else
+ Usage("Too many command options.");
+ }
+--- a/apps/gdalsrsinfo.cpp
++++ b/apps/gdalsrsinfo.cpp
+@@ -212,7 +212,7 @@ int main( int argc, char ** argv )
+ else if( argv[i][0] == '-' )
+ {
+ CSLDestroy( argv );
+- Usage(CPLSPrintf("Unkown option name '%s'", argv[i]));
++ Usage(CPLSPrintf("Unknown option name '%s'", argv[i]));
+ }
+ else
+ pszInput = argv[i];
+--- a/apps/gdaltindex.c
++++ b/apps/gdaltindex.c
+@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
+ skip_different_projection = TRUE;
+ }
+ else if( argv[i_arg][0] == '-' )
+- Usage(CPLSPrintf("Unkown option name '%s'", argv[i_arg]));
++ Usage(CPLSPrintf("Unknown option name '%s'", argv[i_arg]));
+ else if( index_filename == NULL )
+ {
+ index_filename = argv[i_arg];
+--- a/apps/gdaltransform.cpp
++++ b/apps/gdaltransform.cpp
+@@ -202,7 +202,7 @@ int main( int argc, char ** argv )
+ }
+
+ else if( argv[i][0] == '-' )
+- Usage(CPLSPrintf("Unkown option name '%s'", argv[i]));
++ Usage(CPLSPrintf("Unknown option name '%s'", argv[i]));
+
+ else if( pszSrcFilename == NULL )
+ pszSrcFilename = argv[i];
+--- a/apps/gdalwarp.cpp
++++ b/apps/gdalwarp.cpp
+@@ -690,7 +690,7 @@ int main( int argc, char ** argv )
+ bSetColorInterpretation = TRUE;
+
+ else if( argv[i][0] == '-' )
+- Usage(CPLSPrintf("Unkown option name '%s'", argv[i]));
++ Usage(CPLSPrintf("Unknown option name '%s'", argv[i]));
+
+ else
+ papszSrcFiles = CSLAddString( papszSrcFiles, argv[i] );
+--- a/apps/nearblack.cpp
++++ b/apps/nearblack.cpp
+@@ -222,7 +222,7 @@ int main( int argc, char ** argv )
+ papszCreationOptions = CSLAddString(papszCreationOptions, argv[++i]);
+ }
+ else if( argv[i][0] == '-' )
+- Usage(CPLSPrintf("Unkown option name '%s'", argv[i]));
++ Usage(CPLSPrintf("Unknown option name '%s'", argv[i]));
+ else if( pszInFile == NULL )
+ pszInFile = argv[i];
+ else
+--- a/apps/ogr2ogr.cpp
++++ b/apps/ogr2ogr.cpp
+@@ -1309,7 +1309,7 @@ int main( int nArgc, char ** papszArgv )
+ }
+ else if( papszArgv[iArg][0] == '-' )
+ {
+- Usage(CPLSPrintf("Unkown option name '%s'", papszArgv[iArg]));
++ Usage(CPLSPrintf("Unknown option name '%s'", papszArgv[iArg]));
+ }
+ else if( pszDestDataSource == NULL )
+ pszDestDataSource = papszArgv[iArg];
+--- a/apps/ogrinfo.cpp
++++ b/apps/ogrinfo.cpp
+@@ -165,7 +165,7 @@ int main( int nArgc, char ** papszArgv )
+ }
+ else if( papszArgv[iArg][0] == '-' )
+ {
+- Usage(CPLSPrintf("Unkown option name '%s'", papszArgv[iArg]));
++ Usage(CPLSPrintf("Unknown option name '%s'", papszArgv[iArg]));
+ }
+ else if( pszDataSource == NULL )
+ pszDataSource = papszArgv[iArg];
+--- a/ogr/ogrsf_frmts/osm/gpb.h
++++ b/ogr/ogrsf_frmts/osm/gpb.h
+@@ -223,7 +223,7 @@ static void SkipVarInt(GByte** ppabyData
+ pabyData += nDataLength;
+
+ /************************************************************************/
+-/* SkipUnkownField() */
++/* SkipUnknownField() */
+ /************************************************************************/
+
+ #define SKIP_UNKNOWN_FIELD_INLINE(pabyData, pabyDataLimit, verbose) \
+@@ -264,10 +264,10 @@ static void SkipVarInt(GByte** ppabyData
+ }
+
+ static
+-int SkipUnkownField(int nKey, GByte* pabyData, GByte* pabyDataLimit, int verbose) CPL_NO_INLINE;
++int SkipUnknownField(int nKey, GByte* pabyData, GByte* pabyDataLimit, int verbose) CPL_NO_INLINE;
+
+ static
+-int SkipUnkownField(int nKey, GByte* pabyData, GByte* pabyDataLimit, int verbose)
++int SkipUnknownField(int nKey, GByte* pabyData, GByte* pabyDataLimit, int verbose)
+ {
+ GByte* pabyDataBefore = pabyData;
+ SKIP_UNKNOWN_FIELD_INLINE(pabyData, pabyDataLimit, verbose);
+@@ -278,7 +278,7 @@ end_error:
+
+ #define SKIP_UNKNOWN_FIELD(pabyData, pabyDataLimit, verbose) \
+ { \
+- int _nOffset = SkipUnkownField(nKey, pabyData, pabyDataLimit, verbose); \
++ int _nOffset = SkipUnknownField(nKey, pabyData, pabyDataLimit, verbose); \
+ if (_nOffset < 0) \
+ GOTO_END_ERROR; \
+ pabyData += _nOffset; \
+--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
++++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
+@@ -640,7 +640,7 @@ int OGR2SQLITE_BestIndex(sqlite3_vtab *p
+ else if( iCol >= 0 && iCol < poFDefn->GetFieldCount() )
+ pszFieldName = poFDefn->GetFieldDefn(iCol)->GetNameRef();
+ else
+- pszFieldName = "unkown_field";
++ pszFieldName = "unknown_field";
+
+ const char* pszOp;
+ switch(pIndex->aConstraint[i].op)
diff --git a/debian/patches/usefull-typo b/debian/patches/usefull-typo
new file mode 100644
index 0000000..01bbbd0
--- /dev/null
+++ b/debian/patches/usefull-typo
@@ -0,0 +1,463 @@
+--- a/NEWS
++++ b/NEWS
+@@ -2002,7 +2002,7 @@ Port:
+ - /vsitar/ : to read in .tar or .tgz/.tar.gz files
+ * Add C API to create ZIP files
+ * Add support for writable /vsizip/
+- * Add VSIBufferedReaderHandle class that is usefull to improve performance when
++ * Add VSIBufferedReaderHandle class that is useful to improve performance when
+ 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
+@@ -2020,7 +2020,7 @@ Port:
+ Core:
+ * RFC 24: progressive/async raster reading
+ * On Unix, add capability of opening the target of a symlink through GDALOpen()
+- even if it not a real filename. Usefull for opening resources expressed as
++ even if it not a real filename. Useful for opening resources expressed as
+ 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().
+@@ -2440,7 +2440,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()
+- even if it not a real filename. Usefull for opening resources expressed as
++ even if it not a real filename. Useful for opening resources expressed as
+ GDAL virtual filenames in software offering only file explorers (#3902)
+ * Expat based XML readers : add support for reading files with Windows-1252
+ encoding
+@@ -2710,7 +2710,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.
+- (usefull when bandwidth is the limiting factor)
++ (useful when bandwidth is the limiting factor)
+ * Don't instanciate layer defn at layer creation. This can speed up
+ significantly database opening when they are many tables and the user just
+ needs to fetch one with GetLayerByName().
+--- a/apps/ogr_utilities.dox
++++ b/apps/ogr_utilities.dox
+@@ -239,7 +239,7 @@ GEOMETRYCOLLECTION, MULTIPOINT, MULTIPOL
+ 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
++multilinestrings to multilinestrings. Can be useful when converting shapefiles to PostGIS
+ (and other target drivers) that implements strict checks for geometry type.</dd>
+ <dt> <b>-dim</b><em> val</em>:</dt><dd>(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.</dd>
+--- a/doc/gdal_drivertut.dox
++++ b/doc/gdal_drivertut.dox
+@@ -447,7 +447,7 @@ void GDALRegister_JDEM()
+
+ Note the use of GDAL_CHECK_VERSION macro (starting with GDAL 1.5.0).
+ This is an optional macro for drivers inside GDAL tree that don't depend on external libraries,
+-but that can be very usefull if you compile your driver as a plugin (that is to say, an out-of-tree
++but that can be very useful if you compile your driver as a plugin (that is to say, an out-of-tree
+ driver). As the GDAL C++ ABI may, and will, change between GDAL releases (for example from GDAL 1.5.0 to 1.6.0),
+ it may be necessary to recompile your driver against the header files of the GDAL version with
+ which you want to make it work. The GDAL_CHECK_VERSION macro will check that the GDAL version
+--- a/frmts/gtiff/geotiff.cpp
++++ b/frmts/gtiff/geotiff.cpp
+@@ -237,7 +237,7 @@ class GTiffDataset : public GDALPamDatas
+
+ toff_t nDirOffset;
+ int bBase;
+- int bCloseTIFFHandle; /* usefull for closing TIFF handle opened by GTIFF_DIR: */
++ int bCloseTIFFHandle; /* useful for closing TIFF handle opened by GTIFF_DIR: */
+
+ uint16 nPlanarConfig;
+ uint16 nSamplesPerPixel;
+@@ -693,7 +693,7 @@ GTiffRasterBand::GTiffRasterBand( GTiffD
+
+ /* Reads directly bytes from the file using ReadMultiRange(), and by-pass */
+ /* block reading. Restricted to simple TIFF configurations (un-tiled, */
+-/* uncompressed data, standard data types). Particularly usefull to extract */
++/* uncompressed data, standard data types). Particularly useful to extract */
+ /* sub-windows of data on a large /vsicurl dataset). */
+
+ CPLErr GTiffRasterBand::DirectIO( GDALRWFlag eRWFlag,
+@@ -7643,7 +7643,7 @@ TIFF *GTiffDataset::CreateLL( const char
+ }
+
+ /* Set the compression method before asking the default strip size */
+- /* This is usefull when translating to a JPEG-In-TIFF file where */
++ /* This is useful when translating to a JPEG-In-TIFF file where */
+ /* the default strip size is 8 or 16 depending on the photometric value */
+ TIFFSetField( hTIFF, TIFFTAG_COMPRESSION, nCompression );
+
+@@ -8086,7 +8086,7 @@ GTiffDataset::CreateCopy( const char * p
+ int bDirectCopyFromJPEG = FALSE;
+
+ /* Note: JPEG_DIRECT_COPY is not defined by default, because it is mainly */
+- /* usefull for debugging purposes */
++ /* useful for debugging purposes */
+ #ifdef JPEG_DIRECT_COPY
+ if (CSLFetchBoolean(papszCreateOptions, "JPEG_DIRECT_COPY", FALSE) &&
+ GTIFF_CanDirectCopyFromJPEG(poSrcDS, papszCreateOptions))
+--- a/frmts/gtiff/gt_jpeg_copy.cpp
++++ b/frmts/gtiff/gt_jpeg_copy.cpp
+@@ -31,7 +31,7 @@
+ #include "gt_jpeg_copy.h"
+
+ /* Note: JPEG_DIRECT_COPY is not defined by default, because it is mainly */
+-/* usefull for debugging purposes */
++/* useful for debugging purposes */
+
+ CPL_CVSID("$Id: gt_jpeg_copy.cpp 24337 2012-04-28 15:06:01Z rouault $");
+
+--- a/frmts/pcraster/pcrasterutil.cpp
++++ b/frmts/pcraster/pcrasterutil.cpp
+@@ -314,8 +314,8 @@ CSF_VS GDALType2ValueScale(
+ complex.
+
+ If exact is false, conversion to CSF2.0 types will take place. This is
+- usefull for in file cell representations. If exact is true, and exact match
+- is made. This is usefull for in app cell representations.
++ useful for in file cell representations. If exact is true, and exact match
++ is made. This is useful for in app cell representations.
+
+ If exact is false, this function always returns one of CR_UINT1, CR_INT4
+ or CR_REAL4.
+--- a/frmts/pdf/frmt_pdf.html
++++ b/frmts/pdf/frmt_pdf.html
+@@ -73,7 +73,7 @@ off.</li>
+ <h2>LAYERS Metadata domain</h2>
+
+ Starting with GDAL >= 1.10.0 and when GDAL is compiled against libpoppler, the LAYERS metadata domain can be queried
+-to retrieve layer names that can be turned ON or OFF. This is usefull to know which values to specify for the
++to retrieve layer names that can be turned ON or OFF. This is useful to know which values to specify for the
+ <i>GDAL_PDF_LAYERS</i> or <i>GDAL_PDF_LAYERS_OFF</i> configuration options.<p>
+
+ For example :
+@@ -171,7 +171,7 @@ specified, all the extra rasters will be
+ the /FTimesRoman and /FTimesBold fonts.</p></li>
+
+ <li><p><b>EXTRA_IMAGES=image_file_name,x,y,scale[,link=some_url] (possibly repeated)</b>: A list of (ungeoreferenced) images to insert into
+-the page as extra content. This is usefull to insert logos, legends, etc...
++the page as extra content. This is useful to insert logos, legends, etc...
+ x and y are in user units from the lower left corner of the page, and the anchor point is the lower left pixel of the image.
+ scale is a magnifying ratio (use 1 if unsure). If link=some_url is specified, the image will be selectable and its selection
+ will cause a web browser to be opened on the specified URL.</p></li>
+--- a/frmts/sdts/sdtslinereader.cpp
++++ b/frmts/sdts/sdtslinereader.cpp
+@@ -73,7 +73,7 @@ SDTSRawLine::~SDTSRawLine()
+ int SDTSRawLine::Read( SDTS_IREF * poIREF, DDFRecord * poRecord )
+
+ {
+- // E.Rouault: Not sure if this test is really usefull
++ // E.Rouault: Not sure if this test is really useful
+ if( poRecord->GetStringSubfield( "LINE", 0, "MODN", 0 ) == NULL )
+ return FALSE;
+
+--- a/frmts/vrt/vrtsources.cpp
++++ b/frmts/vrt/vrtsources.cpp
+@@ -342,7 +342,7 @@ CPLErr VRTSimpleSource::XMLInit( CPLXMLN
+ /* Newly generated VRT will have RasterXSize, RasterYSize, DataType, */
+ /* BlockXSize, BlockYSize tags, so that we don't have actually to */
+ /* open the real dataset immediately, but we can use a proxy dataset */
+- /* instead. This is particularly usefull when dealing with huge VRT */
++ /* instead. This is particularly useful when dealing with huge VRT */
+ /* For example, a VRT with the world coverage of DTED0 (25594 files) */
+ CPLXMLNode* psSrcProperties = CPLGetXMLNode(psSrc,"SourceProperties");
+ int nRasterXSize = 0, nRasterYSize =0;
+--- a/gcore/gdalrasterband.cpp
++++ b/gcore/gdalrasterband.cpp
+@@ -4712,7 +4712,7 @@ CPLErr CPL_STDCALL GDALCreateMaskBand( G
+ /**
+ * \brief Compute translation table for color tables.
+ *
+- * When the raster band has a palette index, it may be usefull to compute
++ * When the raster band has a palette index, it may be useful to compute
+ * the "translation" of this palette to the palette of another band.
+ * The translation tries to do exact matching first, and then approximate
+ * matching if no exact matching is possible.
+--- a/man/man1/ogr2ogr.1
++++ b/man/man1/ogr2ogr.1
+@@ -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 drivers) that implements strict checks for geometry type.
++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 drivers) that implements strict checks for geometry type.
+ .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.
+ .IP "\fB\fB-a_srs\fP\fI srs_def\fP:\fP" 1c
+--- a/ogr/ogrgeometryfactory.cpp
++++ b/ogr/ogrgeometryfactory.cpp
+@@ -1025,7 +1025,7 @@ typedef enum
+ * of holes is counterclockwise defined (this is the convention for shapefiles e.g.)
+ *
+ * If the OGR_ORGANIZE_POLYGONS configuration option is defined, its value will override
+- * the value of the METHOD option of papszOptions (usefull to modify the behaviour of the
++ * the value of the METHOD option of papszOptions (useful to modify the behaviour of the
+ * shapefile driver)
+ *
+ * @param papoPolygons array of geometry pointers - should all be OGRPolygons.
+--- a/ogr/ogrsf_frmts/generic/ogr_gensql.cpp
++++ b/ogr/ogrsf_frmts/generic/ogr_gensql.cpp
+@@ -1428,7 +1428,7 @@ void OGRGenSQLResultsLayer::CreateOrderB
+
+ /* If it is already sorted, then free than panFIDIndex array */
+ /* so that GetNextFeature() can call a sequential GetNextFeature() */
+- /* on the source array. Very usefull for layers where random access */
++ /* on the source array. Very useful for layers where random access */
+ /* is slow. */
+ /* Use case: the GML result of a WFS GetFeature with a SORTBY */
+ if (bAlreadySorted)
+--- a/ogr/ogrsf_frmts/georss/drv_georss.html
++++ b/ogr/ogrsf_frmts/georss/drv_georss.html
+@@ -61,7 +61,7 @@ Attributes of first level elements will
+
+ Complex content (elements inside first level elements) will be returned as an XML blob.<p>
+
+-When a same element is repeated, a number will be appended at the end of the attribute name for the repetitions. This is usefull for the <category> element in RSS and Atom documents for example.<p>
++When a same element is repeated, a number will be appended at the end of the attribute name for the repetitions. This is useful for the <category> element in RSS and Atom documents for example.<p>
+
+ <p>
+ The following content :
+--- a/ogr/ogrsf_frmts/gml/drv_gml.html
++++ b/ogr/ogrsf_frmts/gml/drv_gml.html
+@@ -117,7 +117,7 @@ description of the .gfs syntax below.<p>
+ OGR 1.8.0 adds support to "merge" the multiple geometries found in a feature by
+ setting the configuration option <b>GML_FETCH_ALL_GEOMETRIES</b> to <b>YES</b>. The geometries
+ will be collected into a GeometryCollection (or Multipolygon if individual geometries
+-are polygons or multipolygons). This can be usefull when reading some GML application profiles.
++are polygons or multipolygons). This can be useful when reading some GML application profiles.
+ If a <GeometryElementPath> element is specified in the .gfs, the fetching will be limited
+ to paths that match the value of <GeometryElementPath>.<p>
+ -->
+--- a/ogr/ogrsf_frmts/null/ogrnulldriver.cpp
++++ b/ogr/ogrsf_frmts/null/ogrnulldriver.cpp
+@@ -27,7 +27,7 @@
+ * DEALINGS IN THE SOFTWARE.
+ ****************************************************************************/
+
+-/* NOTE: this driver is only usefull for debugging and is not included in the build process */
++/* NOTE: this driver is only useful for debugging and is not included in the build process */
+ /* To compile it as a pluing under Linux :
+ g++ -Wall -DDEBUG -fPIC -g ogr/ogrsf_frmts/null/ogrnulldriver.cpp -shared -o ogr_NULL.so -L. -lgdal -Iport -Igcore -Iogr -Iogr/ogrsf_frmts
+ */
+--- a/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
++++ b/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
+@@ -2521,7 +2521,7 @@ int OGROSMDataSource::Open( const char *
+ return FALSE;
+ }
+
+- /* The following 4 config options are only usefull for debugging */
++ /* The following 4 config options are only useful for debugging */
+ bIndexPoints = CSLTestBoolean(CPLGetConfigOption("OSM_INDEX_POINTS", "YES"));
+ bUsePointsIndex = CSLTestBoolean(CPLGetConfigOption("OSM_USE_POINTS_INDEX", "YES"));
+ bIndexWays = CSLTestBoolean(CPLGetConfigOption("OSM_INDEX_WAYS", "YES"));
+--- a/ogr/ogrsf_frmts/pdf/drv_pdf.html
++++ b/ogr/ogrsf_frmts/pdf/drv_pdf.html
+@@ -65,7 +65,7 @@ Set the DPI to use. Default to 72.</p></
+ the /FTimesRoman and /FTimesBold fonts.</p></li>
+
+ <li><p><b>EXTRA_IMAGES=image_file_name,x,y,scale[,link=some_url] (possibly repeated)</b>: A list of (ungeoreferenced) images to insert into
+-the page as extra content. This is usefull to insert logos, legends, etc...
++the page as extra content. This is useful to insert logos, legends, etc...
+ x and y are in user units from the lower left corner of the page, and the anchor point is the lower left pixel of the image.
+ scale is a magnifying ratio (use 1 if unsure). If link=some_url is specified, the image will be selectable and its selection
+ will cause a web browser to be opened on the specified URL.</p></li>
+--- a/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
++++ b/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
+@@ -555,7 +555,7 @@ void OGRShapeLayer::SetSpatialFilter( OG
+ {
+ /* We clear the spatialFIDs only if we have a new non-NULL */
+ /* spatial filter, otherwise we keep the previous result */
+- /* cached. This can be usefull when several SQL layers */
++ /* cached. This can be useful when several SQL layers */
+ /* rely on the same table layer, and use the same spatial */
+ /* filters. But as there is in the destructor of OGRGenSQLResultsLayer */
+ /* a clearing of the spatial filter of the table layer, we */
+--- a/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.cpp
++++ b/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.cpp
+@@ -544,7 +544,7 @@ OGRLayer * OGRSQLiteExecuteSQL( OGRDataS
+ }
+ }
+
+- /* The following configuration option is usefull mostly for debugging/testing */
++ /* The following configuration option is useful mostly for debugging/testing */
+ if( pabyEmptyDB != NULL && CSLTestBoolean(CPLGetConfigOption("OGR_SQLITE_DIALECT_USE_SPATIALITE", "YES")) )
+ {
+ GByte* pabyEmptyDBClone = (GByte*)VSIMalloc(nEmptyDBSize);
+--- a/ogr/ogrsf_frmts/vrt/drv_vrt.html
++++ b/ogr/ogrsf_frmts/vrt/drv_vrt.html
+@@ -145,12 +145,12 @@ default defaults to the value of "name".
+
+ <li> <b>FeatureCount</b> (optional, from GDAL 1.10.0) : This element is used
+ to define the feature count of the layer (when no spatial or attribute filter is set).
+-This can be usefull on static data, when getting the feature count from the source layer is slow.</li>
++This can be useful on static data, when getting the feature count from the source layer is slow.</li>
+
+ <br>
+
+ <li> <b>ExtentXMin</b>, <b>ExtentYMin</b>, <b>ExtentXMax</b> and <b>ExtentXMax</b> (optional, from GDAL 1.10.0) :
+-Those elements are used to define the extent of the layer. This can be usefull on static data, when
++Those elements are used to define the extent of the layer. This can be useful on static data, when
+ getting the extent from the source layer is slow.</li>
+
+ <br>
+@@ -178,7 +178,7 @@ reference to use for the layer after rep
+ <br>
+
+ <li> <b>ExtentXMin</b>, <b>ExtentYMin</b>, <b>ExtentXMax</b> and <b>ExtentXMax</b> (optional, from GDAL 1.10.0) :
+-Those elements are used to define the extent of the layer. This can be usefull on static data, when
++Those elements are used to define the extent of the layer. This can be useful on static data, when
+ getting the extent from the source layer is slow.</li>
+
+ <br>
+@@ -254,7 +254,7 @@ the layer as a point layer, and as being
+
+ <h2>Example: Renaming attributes</h2>
+
+-It can be usefull in some circumstances to be able to rename the field names
++It can be useful in some circumstances to be able to rename the field names
+ from a source layer to other names. This is particularly true when you want
+ to transcode to a format whose schema is fixed, such as GPX
+ (<name>, <desc>, etc.). This can be accomplished using
+--- a/port/cpl_conv.cpp
++++ b/port/cpl_conv.cpp
+@@ -1527,7 +1527,7 @@ static void CPLAccessConfigOption(const
+ * char* pszOldVal = pszOldValTmp ? CPLStrdup(pszOldValTmp) : NULL;
+ * // override with new value
+ * CPLSetConfigOption(pszKey, pszNewVal);
+- * // do something usefull
++ * // do something useful
+ * // restore old value
+ * CPLSetConfigOption(pszKey, pszOldVal);
+ * CPLFree(pszOldVal);
+--- a/port/cpl_http.cpp
++++ b/port/cpl_http.cpp
+@@ -513,7 +513,7 @@ void CPLHTTPSetOptions(CURL *http_handle
+ /************************************************************************/
+
+ /**
+- * \brief Return if CPLHTTP services can be usefull
++ * \brief Return if CPLHTTP services can be useful
+ *
+ * Those services depend on GDAL being build with libcurl support.
+ *
+--- a/swig/java/javadoc.java
++++ b/swig/java/javadoc.java
+@@ -5062,7 +5062,7 @@ public class org.gdal.gdal.Driver:public
+ * Class used to report progression of long operations.
+ * <p>
+ * This class will not do anything by itself, but it can be subclassed, like <a href="TermProgressCallback.html">TermProgressCallback</a> class.
+- * to do more usefull things.
++ * to do more useful things.
+ *
+ * @since Java bindings 1.7.0
+ */
+--- a/swig/python/scripts/gdal2tiles.py
++++ b/swig/python/scripts/gdal2tiles.py
+@@ -91,7 +91,7 @@ Created by Klokan Petr Pridal on 2008-07
+ Google Summer of Code 2008, project GDAL2Tiles for OSGEO.
+
+ In case you use this class in your product, translate it to another language
+-or find it usefull for your project please let me know.
++or find it useful for your project please let me know.
+ My email: klokan at klokan dot cz.
+ I would like to know where it was used.
+
+--- a/swig/python/scripts/gdal_retile.py
++++ b/swig/python/scripts/gdal_retile.py
+@@ -45,7 +45,7 @@ import os
+ import math
+
+ class AffineTransformDecorator:
+- """ A class providing some usefull methods for affine Transformations """
++ """ A class providing some useful methods for affine Transformations """
+ def __init__(self, transform ):
+ self.geotransform=transform
+ self.scaleX=self.geotransform[1]
+--- a/alg/gdal_rpc.cpp
++++ b/alg/gdal_rpc.cpp
+@@ -335,7 +335,7 @@ typedef struct {
+ * an average height above sea level for ground in the target scene.
+ *
+ * <li> RPC_HEIGHT_SCALE: a factor used to multiply heights above ground.
+- * Usefull when elevation offsets of the DEM are not expressed in meters. (GDAL >= 1.8.0)
++ * Useful when elevation offsets of the DEM are not expressed in meters. (GDAL >= 1.8.0)
+ *
+ * <li> RPC_DEM: the name of a GDAL dataset (a DEM file typically) used to
+ * extract elevation offsets from. In this situation the Z passed into the
+--- a/apps/gdaladdo.cpp
++++ b/apps/gdaladdo.cpp
+@@ -51,7 +51,7 @@ static void Usage(const char* pszErrorMs
+ " filename: The file to build overviews for (or whose overviews must be removed).\n"
+ " levels: A list of integral overview levels to build. Ignored with -clean option.\n"
+ "\n"
+- "Usefull configuration variables :\n"
++ "Useful configuration variables :\n"
+ " --config USE_RRD YES : Use Erdas Imagine format (.aux) as overview format.\n"
+ "Below, only for external overviews in GeoTIFF format:\n"
+ " --config COMPRESS_OVERVIEW {JPEG,LZW,PACKBITS,DEFLATE} : TIFF compression\n"
+--- a/frmts/wms/frmt_wms.html
++++ b/frmts/wms/frmt_wms.html
+@@ -188,7 +188,7 @@
+ </tr>
+ <tr>
+ <td class="xml"> <OfflineMode><span class="value">true</span></OfflineMode></td>
+- <td class="desc">Do not download any new images, use only what is in cache. Usefull only with cache enabled. (optional, defaults to false)</td>
++ <td class="desc">Do not download any new images, use only what is in cache. Useful only with cache enabled. (optional, defaults to false)</td>
+ </tr>
+ <tr>
+ <td class="xml"> <AdviseRead><span class="value">true</span></AdviseRead></td>
+--- a/gcore/gdal_priv.h
++++ b/gcore/gdal_priv.h
+@@ -912,7 +912,7 @@ int CPL_DLL GDALCheckDatasetDimensions(
+ int CPL_DLL GDALCheckBandCount( int nBands, int bIsZeroAllowed );
+
+
+-// Test if 2 floating point values match. Usefull when comparing values
++// Test if 2 floating point values match. Useful when comparing values
+ // stored as a string at some point. See #3573, #4183, #4506
+ #define ARE_REAL_EQUAL(dfVal1, dfVal2) \
+ (dfVal1 == dfVal2 || fabs(dfVal1 - dfVal2) < 1e-10 || (dfVal2 != 0 && fabs(1 - dfVal1 / dfVal2) < 1e-10 ))
+--- a/gcore/gdaldataset.cpp
++++ b/gcore/gdaldataset.cpp
+@@ -1846,7 +1846,7 @@ void CPL_STDCALL GDALGetOpenDatasets( GD
+ /* GDALCleanOpenDatasetsList() */
+ /************************************************************************/
+
+-/* Usefull when called from the child of a fork(), to avoid closing */
++/* Useful when called from the child of a fork(), to avoid closing */
+ /* the datasets of the parent at the child termination */
+ void GDALNullifyOpenDatasetsList()
+ {
+--- a/ogr/ogrsf_frmts/gpx/ogrgpxlayer.cpp
++++ b/ogr/ogrsf_frmts/gpx/ogrgpxlayer.cpp
+@@ -1084,7 +1084,7 @@ OGRSpatialReference *OGRGPXLayer::GetSpa
+ static char* OGRGPX_GetXMLCompatibleTagName(const char* pszExtensionsNS,
+ const char* pszName)
+ {
+- /* Skip "ogr_" for example if NS is "ogr". Usefull for GPX -> GPX roundtrip */
++ /* Skip "ogr_" for example if NS is "ogr". Useful for GPX -> GPX roundtrip */
+ if (strncmp(pszName, pszExtensionsNS, strlen(pszExtensionsNS)) == 0 &&
+ pszName[strlen(pszExtensionsNS)] == '_')
+ {
+--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp
++++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp
+@@ -330,7 +330,7 @@ void OGRSQLiteLayer::BuildFeatureDefn( c
+ }
+
+ // Recognize a geometry column from trying to build the geometry
+- // Usefull for OGRSQLiteSelectLayer
++ // Useful for OGRSQLiteSelectLayer
+ if( nColType == SQLITE_BLOB && osGeomColumn.size() == 0 )
+ {
+ const int nBytes = sqlite3_column_bytes( hStmt, iCol );
+--- a/port/cpl_string.cpp
++++ b/port/cpl_string.cpp
+@@ -2166,7 +2166,7 @@ size_t CPLStrlcat(char* pszDest, const c
+ * the specified number of bytes.
+ *
+ * The CPLStrnlen() function returns MIN(strlen(pszStr), nMaxLen).
+- * Only the first nMaxLen bytes of the string will be read. Usefull to
++ * Only the first nMaxLen bytes of the string will be read. Useful to
+ * test if a string contains at least nMaxLen characters without reading
+ * the full string up to the NUL terminating character.
+ *
--
GDAL/OGR library and tools
More information about the Pkg-grass-devel
mailing list