This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch experimental
in repository gdal.
commit c0b4ca857f70c1f8066d344ad1f58ddb457ee60a
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sat May 3 13:59:08 2014 +0200
Update typo patches.
---
debian/changelog | 1 +
debian/patches/supress-typo | 486 ++++++++++++++++++++++++++++++++++++++++++++
debian/patches/usefull-typo | 36 ++++
3 files changed, 523 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index ad0e7d8..cd8c31c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ gdal (1.11.0+dfsg-1) UNRELEASED; urgency=low
* Don't use -Werror=format-security, causes build failure on
ogrsxfdatasource.cpp.
* Add patch to fix 'recommended' typo.
+ * Update typo patches.
-- Bas Couwenberg <sebas...@xs4all.nl> Wed, 30 Apr 2014 20:10:05 +0200
diff --git a/debian/patches/supress-typo b/debian/patches/supress-typo
index 187935a..5bbed76 100644
--- a/debian/patches/supress-typo
+++ b/debian/patches/supress-typo
@@ -12,3 +12,489 @@ Last-Update: 2014-01-11
summary information like projection, schema, feature count and
extents.</dd>
<dt> <b>-q</b>:</dt><dd> Quiet verbose reporting of various information,
including
+@@ -473,7 +473,7 @@ format. Also some information writed to
+ <dl>
+ <dt><b>--help-general</b>:</dt><dd> Show the usage.</dd>
+ <dt><b>-progress</b>:</dt><dd> Show progress.</dd>
+-<dt><b>-quiet</b>:</dt><dd> Supress all messages except errors and
results.</dd>
++<dt><b>-quiet</b>:</dt><dd> Suppress all messages except errors and
results.</dd>
+ <dt><b>-f</b> <em>format_name</em>:</dt><dd> Select an output format name.
+ The default is to create a shapefile.</dd>
+ <dt> <b>-dsco</b> <em>NAME=VALUE</em>:</dt><dd> Dataset creation option
+--- a/NEWS
++++ b/NEWS
+@@ -1694,7 +1694,7 @@ Utilities:
+ * gdalwarp: speed-up when using -tps with large number of GCPs
+ * gdalwarp: add support for optional use of libarmadillo to speed-up matrix
inversion in -tps mode
+ * gdalwarp: detect situations where the user will override the source file
+- * gdallocationinfo: do not let one off-db pixel cause all the rest to be
supressed (#4181)
++ * gdallocationinfo: do not let one off-db pixel cause all the rest to be
suppressed (#4181)
+ * gdal_rasterize: fix half pixel shift when rasterizing points; make
gdal_rasterize utility increase the computed raster extent by a half-pixel for
point layers (#3774)
+ * gdal_rasterize: when source datasource has a single layer, use it
implicitely if none of -l or -sql is specified
+ * nearblack: add -color option (#4085)
+@@ -3388,7 +3388,7 @@ Python bindings:
+ when used and set to True, None is returned when GDALGetGeoTransform()
+ returns CE_Failure (instead of the fake (0,1,0,0,0,1)); backward
+ compatibility preserved when the parameter isn't specified
+- * Avoid supressing warnings and errors when exceptions are used (#3632)
++ * Avoid suppressing warnings and errors when exceptions are used (#3632)
+ * Add gdalinfo.py, ogrinfo.py and ogr2ogr.py as sample scripts, direct ports
+ of corresponding C/C++ utilities
+ * Allow manipulating buffer > 2 GB on 64bit builds for ReadRaster() and
WriteRaster()
+--- a/apps/gdalsrsinfo.cpp
++++ b/apps/gdalsrsinfo.cpp
+@@ -336,7 +336,7 @@ int FindSRS( const char *pszInput, OGRSp
+ OGRErr eErr = CE_None;
+ int bDebug = FALSE;
+
+- /* temporarily supress error messages we may get from xOpen() */
++ /* temporarily suppress error messages we may get from xOpen() */
+ bDebug = CSLTestBoolean(CPLGetConfigOption("CPL_DEBUG", "OFF"));
+ if ( ! bDebug )
+ oErrorHandler = CPLSetErrorHandler ( CPLQuietErrorHandler );
+--- a/frmts/aigrid/aitest.c
++++ b/frmts/aigrid/aitest.c
+@@ -115,7 +115,7 @@ int main( int argc, char ** argv )
+ AIGInfo_t *psInfo;
+ GInt32 *panRaster;
+ int i, j;
+- int bMagic = FALSE, bSupressMagic = FALSE;
++ int bMagic = FALSE, bSuppressMagic = FALSE;
+ int iTestTileX = 0, iTestTileY = 0;
+
+ /* -------------------------------------------------------------------- */
+@@ -127,7 +127,7 @@ int main( int argc, char ** argv )
+ bMagic = TRUE;
+
+ else if( EQUAL(argv[1],"-nomagic") )
+- bSupressMagic = TRUE;
++ bSuppressMagic = TRUE;
+
+ else if( EQUAL(argv[1],"-t") && argc > 2 )
+ {
+@@ -184,7 +184,7 @@ int main( int argc, char ** argv )
+ /* Do we want a dump of all the ``magic'' numbers for */
+ /* instantated blocks? */
+ /* -------------------------------------------------------------------- */
+- if( !bSupressMagic )
++ if( !bSuppressMagic )
+ DumpMagic( psInfo, bMagic );
+
+ /* -------------------------------------------------------------------- */
+--- a/frmts/ecw/ecwcreatecopy.cpp
++++ b/frmts/ecw/ecwcreatecopy.cpp
+@@ -810,7 +810,7 @@ CPLErr GDALECWCompressor::Initialize(
+
+ pszOption = CSLFetchNameValue(papszOptions, "GEODATA_USAGE");
+ if( pszOption == NULL )
+- // Default to supressing ECW SDK geodata, just use our own stuff.
++ // Default to suppressing ECW SDK geodata, just use our own stuff.
+ SetGeodataUsage( JP2_GEODATA_USE_NONE );
+ else if( EQUAL(pszOption,"NONE") )
+ SetGeodataUsage( JP2_GEODATA_USE_NONE );
+--- a/frmts/gdalallregister.cpp
++++ b/frmts/gdalallregister.cpp
+@@ -532,7 +532,7 @@ void CPL_STDCALL GDALAllRegister()
+ GDALRegister_IRIS();
+ #endif
+ /* -------------------------------------------------------------------- */
+-/* Deregister any drivers explicitly marked as supressed by the */
++/* Deregister any drivers explicitly marked as suppressed by the */
+ /* GDAL_SKIP environment variable. */
+ /* -------------------------------------------------------------------- */
+ GetGDALDriverManager()->AutoSkipDrivers();
+--- a/frmts/gtiff/libtiff/tif_zip.c
++++ b/frmts/gtiff/libtiff/tif_zip.c
+@@ -36,7 +36,7 @@
+ * of the library: this code assumes the 1.0 API and also depends on
+ * the ability to write the zlib header multiple times (one per strip)
+ * which was not possible with versions prior to 0.95. Note also that
+- * older versions of this codec avoided this bug by supressing the header
++ * older versions of this codec avoided this bug by suppressing the header
+ * entirely. This means that files written with the old library cannot
+ * be read; they should be converted to a different compression scheme
+ * and then reconverted.
+--- a/frmts/zlib/deflate.h
++++ b/frmts/zlib/deflate.h
+@@ -188,7 +188,7 @@ typedef struct internal_state {
+ int nice_match; /* Stop searching when current match exceeds this */
+
+ /* used by trees.c: */
+- /* Didn't use ct_data typedef below to supress compiler warning */
++ /* Didn't use ct_data typedef below to suppress compiler warning */
+ struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */
+ struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
+ struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths
*/
+--- a/gcore/gdaljp2metadata.cpp
++++ b/gcore/gdaljp2metadata.cpp
+@@ -900,7 +900,7 @@ int GDALJP2Metadata::ParseGMLCoverageDes
+ "FALSE" ) ) )
+ {
+ bNeedAxisFlip = FALSE;
+- CPLDebug( "GMLJP2", "Supressed axis flipping based on
GDAL_IGNORE_AXIS_ORIENTATION." );
++ CPLDebug( "GMLJP2", "Suppressed axis flipping based on
GDAL_IGNORE_AXIS_ORIENTATION." );
+ }
+
+ if( bNeedAxisFlip )
+@@ -1119,7 +1119,7 @@ GDALJP2Box *GDALJP2Metadata::CreateGMLJP
+ "FALSE" ) ) )
+ {
+ bNeedAxisFlip = FALSE;
+- CPLDebug( "GMLJP2", "Supressed axis flipping on write based on
GDAL_IGNORE_AXIS_ORIENTATION." );
++ CPLDebug( "GMLJP2", "Suppressed axis flipping on write based on
GDAL_IGNORE_AXIS_ORIENTATION." );
+ }
+
+ if( bNeedAxisFlip )
+--- a/gcore/gdalpamdataset.cpp
++++ b/gcore/gdalpamdataset.cpp
+@@ -859,7 +859,7 @@ CPLErr GDALPamDataset::CloneInfo( GDALDa
+ PamInitialize();
+
+ /* -------------------------------------------------------------------- */
+-/* Supress NotImplemented error messages - mainly needed if PAM */
++/* Suppress NotImplemented error messages - mainly needed if PAM */
+ /* disabled. */
+ /* -------------------------------------------------------------------- */
+ SetMOFlags( nSavedMOFlags | GMO_IGNORE_UNIMPLEMENTED );
+--- a/gcore/gdalpamrasterband.cpp
++++ b/gcore/gdalpamrasterband.cpp
+@@ -481,7 +481,7 @@ CPLErr GDALPamRasterBand::CloneInfo( GDA
+ PamInitialize();
+
+ /* -------------------------------------------------------------------- */
+-/* Supress NotImplemented error messages - mainly needed if PAM */
++/* Suppress NotImplemented error messages - mainly needed if PAM */
+ /* disabled. */
+ /* -------------------------------------------------------------------- */
+ SetMOFlags( nSavedMOFlags | GMO_IGNORE_UNIMPLEMENTED );
+--- a/man/man1/gdal_fillnodata.1
++++ b/man/man1/gdal_fillnodata.1
+@@ -24,7 +24,7 @@ The gdal_fillnodata.py script fills sele
+ Additional details on the algorithm are available in the GDALFillNodata()
docs.
+ .PP
+ .IP "\fB\fB-q\fP:\fP" 1c
+-The script runs in quiet mode. The progress monitor is supressed and routine
messages are not displayed.
++The script runs in quiet mode. The progress monitor is suppressed and routine
messages are not displayed.
+ .PP
+ .IP "\fB\fB-md\fP \fImax_distance\fP:\fP" 1c
+ The maximum distance (in pixels) that the algorithm will search out for
values to interpolate.
+--- a/man/man1/gdal_polygonize.1
++++ b/man/man1/gdal_polygonize.1
+@@ -52,7 +52,7 @@ The name of the layer created to hold th
+ The name of the field to create (defaults to 'DN').
+ .PP
+ .IP "\fB\fB-q\fP:\fP" 1c
+-The script runs in quiet mode. The progress monitor is supressed and routine
messages are not displayed.
++The script runs in quiet mode. The progress monitor is suppressed and routine
messages are not displayed.
+ .PP
+ .PP
+ .PP
+--- a/man/man1/gdal_sieve.1
++++ b/man/man1/gdal_sieve.1
+@@ -23,7 +23,7 @@ The gdal_sieve.py script removes raster
+ Additional details on the algorithm are available in the GDALSieveFilter()
docs.
+ .PP
+ .IP "\fB\fB-q\fP:\fP" 1c
+-The script runs in quiet mode. The progress monitor is supressed and routine
messages are not displayed.
++The script runs in quiet mode. The progress monitor is suppressed and routine
messages are not displayed.
+ .PP
+ .IP "\fB\fB-st\fP \fIthreshold\fP:\fP" 1c
+ Set the size threshold in pixels. Only raster polygons smaller than this size
will be removed.
+--- a/man/man1/ogrinfo.1
++++ b/man/man1/ogrinfo.1
+@@ -30,7 +30,7 @@ Open the data source in read-only mode.
+ .IP "\fB\fB-al\fP:\fP" 1c
+ List all features of all layers (used instead of having to give layer names
as arguments).
+ .IP "\fB\fB-so\fP:\fP" 1c
+-Summary Only: supress listing of features, show only the summary information
like projection, schema, feature count and extents.
++Summary Only: suppress listing of features, show only the summary information
like projection, schema, feature count and extents.
+ .IP "\fB\fB-q\fP:\fP" 1c
+ Quiet verbose reporting of various information, including coordinate system,
layer schema, extents, and feature count.
+ .IP "\fB\fB-where\fP \fIrestricted_where\fP:\fP" 1c
+--- a/man/man1/ogrlineref.1
++++ b/man/man1/ogrlineref.1
+@@ -43,7 +43,7 @@ Show the usage.
+ .IP "\fB\fB-progress\fP:\fP" 1c
+ Show progress.
+ .IP "\fB\fB-quiet\fP:\fP" 1c
+-Supress all messages except errors and results.
++Suppress all messages except errors and results.
+ .IP "\fB\fB-f\fP \fIformat_name\fP:\fP" 1c
+ Select an output format name. The default is to create a shapefile.
+ .IP "\fB\fB-dsco\fP \fINAME=VALUE\fP:\fP" 1c
+--- a/nmake.opt
++++ b/nmake.opt
+@@ -141,7 +141,7 @@ OPTFLAGS= $(CXX_PDB_FLAGS) /nologo /MD /
+ !ENDIF # OPTFLAGS
+
+ #
+-# Set flags controlling warnings level, and supression of some warnings.
++# Set flags controlling warnings level, and suppression of some warnings.
+ #
+ !IFNDEF WARNFLAGS
+ WARNFLAGS = /W4 /wd4127 /wd4251 /wd4275 /wd4786 /wd4100 /wd4245 /wd4206
/wd4018 /wd4389
+--- a/ogr/ogr_core.h
++++ b/ogr/ogr_core.h
+@@ -158,7 +158,7 @@ typedef struct
+ * Simple container for a bounding region in 3D.
+ */
+
+-#if defined(__cplusplus) && !defined(CPL_SUPRESS_CPLUSPLUS)
++#if defined(__cplusplus) && !defined(CPL_SURESS_CPLUSPLUS)
+ class CPL_DLL OGREnvelope3D : public OGREnvelope
+ {
+ public:
+--- a/ogr/ogrct.cpp
++++ b/ogr/ogrct.cpp
+@@ -941,7 +941,7 @@ int OGRProj4CT::TransformEx( int nCount,
+ /* -------------------------------------------------------------------- */
+ /* Try to report an error through CPL. Get proj.4 error string */
+ /* if possible. Try to avoid reporting thousands of error */
+-/* ... supress further error reporting on this OGRProj4CT if we */
++/* ... suppress further error reporting on this OGRProj4CT if we */
+ /* have already reported 20 errors. */
+ /* -------------------------------------------------------------------- */
+ if( err != 0 )
+@@ -973,7 +973,7 @@ int OGRProj4CT::TransformEx( int nCount,
+ else if( nErrorCount == 20 )
+ {
+ CPLError( CE_Failure, CPLE_AppDefined,
+- "Reprojection failed, err = %d, further errors will be
supressed on the transform object.",
++ "Reprojection failed, err = %d, further errors will be
suppressed on the transform object.",
+ err );
+ }
+
+--- a/ogr/ogrsf_frmts/arcobjects/aolayer.cpp
++++ b/ogr/ogrsf_frmts/arcobjects/aolayer.cpp
+@@ -37,7 +37,7 @@
+ /************************************************************************/
+ AOLayer::AOLayer():
+ OGRLayer(),m_pFeatureDefn(NULL),m_pSRS(NULL), m_ipQF(CLSID_QueryFilter),
+-m_pBuffer(NULL), m_bufferSize(0),
m_supressColumnMappingError(false),m_forceMulti(false)
++m_pBuffer(NULL), m_bufferSize(0),
m_suppressColumnMappingError(false),m_forceMulti(false)
+ {
+ }
+
+@@ -419,7 +419,7 @@ bool AOLayer::OGRFeatureFromAORow(IRow*
+ */
+ default:
+ {
+- if (!m_supressColumnMappingError)
++ if (!m_suppressColumnMappingError)
+ {
+ foundBadColumn = true;
+ CPLError( CE_Warning, CPLE_AppDefined, "Row id: %d col:%d has
unhandled col type (%d). Setting to NULL.", oid, i,
m_pFeatureDefn->GetFieldDefn(i)->GetType());
+@@ -429,7 +429,7 @@ bool AOLayer::OGRFeatureFromAORow(IRow*
+ }
+
+ if (foundBadColumn)
+- m_supressColumnMappingError = true;
++ m_suppressColumnMappingError = true;
+
+
+ *ppFeature = pOutFeature;
+--- a/ogr/ogrsf_frmts/arcobjects/ogr_ao.h
++++ b/ogr/ogrsf_frmts/arcobjects/ogr_ao.h
+@@ -115,7 +115,7 @@ protected:
+ //buffers are used for avoiding constant reallocation of temp memory
+ unsigned char* m_pBuffer;
+ long m_bufferSize; //in bytes
+- bool m_supressColumnMappingError;
++ bool m_suppressColumnMappingError;
+ bool m_forceMulti;
+ };
+
+--- a/ogr/ogrsf_frmts/avc/ogravcbindatasource.cpp
++++ b/ogr/ogrsf_frmts/avc/ogravcbindatasource.cpp
+@@ -75,7 +75,7 @@ int OGRAVCBinDataSource::Open( const cha
+
+ {
+ /* -------------------------------------------------------------------- */
+-/* Open the source file. Supress error reporting if we are in */
++/* Open the source file. Suppress error reporting if we are in */
+ /* TestOpen mode. */
+ /* -------------------------------------------------------------------- */
+ if( bTestOpen )
+--- a/ogr/ogrsf_frmts/avc/ogravce00datasource.cpp
++++ b/ogr/ogrsf_frmts/avc/ogravce00datasource.cpp
+@@ -73,7 +73,7 @@ int OGRAVCE00DataSource::Open( const cha
+
+ {
+ /* -------------------------------------------------------------------- */
+-/* Open the source file. Supress error reporting if we are in */
++/* Open the source file. Suppress error reporting if we are in */
+ /* TestOpen mode. */
+ /* -------------------------------------------------------------------- */
+ int bCompressed = FALSE;
+--- a/ogr/ogrsf_frmts/dwg/ogrdwg_dimension.cpp
++++ b/ogr/ogrsf_frmts/dwg/ogrdwg_dimension.cpp
+@@ -297,7 +297,7 @@ the approach is as above in all these ca
+ /* feature for the next feature read. */
+ /* -------------------------------------------------------------------- */
+
+- // a single space supresses labelling.
++ // a single space suppresses labelling.
+ if( osText == " " )
+ return poFeature;
+
+--- a/ogr/ogrsf_frmts/dxf/ogrdxf_dimension.cpp
++++ b/ogr/ogrsf_frmts/dxf/ogrdxf_dimension.cpp
+@@ -307,7 +307,7 @@ the approach is as above in all these ca
+ /* feature for the next feature read. */
+ /* -------------------------------------------------------------------- */
+
+- // a single space supresses labelling.
++ // a single space suppresses labelling.
+ if( osText == " " )
+ return poFeature;
+
+--- a/ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp
++++ b/ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp
+@@ -47,7 +47,7 @@ using std::wstring;
+ /************************************************************************/
+ FGdbBaseLayer::FGdbBaseLayer() :
+ m_pFeatureDefn(NULL), m_pSRS(NULL), m_pEnumRows(NULL),
+- m_supressColumnMappingError(false), m_forceMulti(false)
++ m_suppressColumnMappingError(false), m_forceMulti(false)
+ {
+ }
+
+@@ -2325,7 +2325,7 @@ bool FGdbBaseLayer::OGRFeatureFromGdbRow
+
+ default:
+ {
+- if (!m_supressColumnMappingError)
++ if (!m_suppressColumnMappingError)
+ {
+ foundBadColumn = true;
+ CPLError( CE_Warning, CPLE_AppDefined,
+@@ -2337,7 +2337,7 @@ bool FGdbBaseLayer::OGRFeatureFromGdbRow
+ }
+
+ if (foundBadColumn)
+- m_supressColumnMappingError = true;
++ m_suppressColumnMappingError = true;
+
+
+ *ppFeature = pOutFeature;
+--- a/ogr/ogrsf_frmts/filegdb/FGdbResultLayer.cpp
++++ b/ogr/ogrsf_frmts/filegdb/FGdbResultLayer.cpp
+@@ -47,7 +47,7 @@ FGdbResultLayer::FGdbResultLayer(FGdbDat
+ m_pDS = pParentDataSource;
+ osSQL = pszSQL;
+
+- m_supressColumnMappingError = false;
++ m_suppressColumnMappingError = false;
+
+ FieldInfo fieldInfo;
+ m_pEnumRows->GetFieldInformation(fieldInfo);
+--- a/ogr/ogrsf_frmts/filegdb/ogr_fgdb.h
++++ b/ogr/ogrsf_frmts/filegdb/ogr_fgdb.h
+@@ -82,7 +82,7 @@ protected:
+ std::vector<std::wstring> m_vOGRFieldToESRIField; //OGR Field Index to ESRI
Field Name Mapping
+ std::vector<std::string> m_vOGRFieldToESRIFieldType; //OGR Field Index to
ESRI Field Type Mapping
+
+- bool m_supressColumnMappingError;
++ bool m_suppressColumnMappingError;
+ bool m_forceMulti;
+
+ bool OGRFeatureFromGdbRow(Row* pRow, OGRFeature** ppFeature);
+--- a/port/cpl_error.cpp
++++ b/port/cpl_error.cpp
+@@ -139,7 +139,7 @@ void* CPL_STDCALL CPLGetErrorHandlerUser
+ *
+ * The default behaviour of CPLError() is to report errors to stderr,
+ * and to abort() after reporting a CE_Fatal error. It is expected that
+- * some applications will want to supress error reporting, and will want to
++ * some applications will want to suppress error reporting, and will want to
+ * install a C++ exception, or longjmp() approach to no local fatal error
+ * recovery.
+ *
+--- a/swig/include/python/python_exceptions.i
++++ b/swig/include/python/python_exceptions.i
+@@ -11,7 +11,7 @@ void CPL_STDCALL
+ PythonBindingErrorHandler(CPLErr eclass, int code, const char *msg )
+ {
+ /*
+- ** Generally we want to supress error reporting if we have exceptions
++ ** Generally we want to suppress error reporting if we have exceptions
+ ** enabled as the error message will be in the exception thrown in
+ ** Python.
+ */
+--- a/swig/java/javadoc.java
++++ b/swig/java/javadoc.java
+@@ -195,7 +195,7 @@ public class gdal:public static int SetE
+ * <p>
+ * The default behaviour of Error() is to report errors to stderr,
+ * and to abort() after reporting a gdalconst.CE_Fatal error. It is expected
that
+- * some applications will want to supress error reporting, and will want to
++ * some applications will want to suppress error reporting, and will want to
+ * install a C++ exception, or longjmp() approach to no local fatal error
+ * recovery.
+ * <p>
+--- a/swig/python/extensions/gdal_wrap.cpp
++++ b/swig/python/extensions/gdal_wrap.cpp
+@@ -2883,7 +2883,7 @@ void CPL_STDCALL
+ PythonBindingErrorHandler(CPLErr eclass, int code, const char *msg )
+ {
+ /*
+- ** Generally we want to supress error reporting if we have exceptions
++ ** Generally we want to suppress error reporting if we have exceptions
+ ** enabled as the error message will be in the exception thrown in
+ ** Python.
+ */
+--- a/swig/python/extensions/ogr_wrap.cpp
++++ b/swig/python/extensions/ogr_wrap.cpp
+@@ -2937,7 +2937,7 @@ void CPL_STDCALL
+ PythonBindingErrorHandler(CPLErr eclass, int code, const char *msg )
+ {
+ /*
+- ** Generally we want to supress error reporting if we have exceptions
++ ** Generally we want to suppress error reporting if we have exceptions
+ ** enabled as the error message will be in the exception thrown in
+ ** Python.
+ */
+--- a/swig/python/extensions/osr_wrap.cpp
++++ b/swig/python/extensions/osr_wrap.cpp
+@@ -2900,7 +2900,7 @@ void CPL_STDCALL
+ PythonBindingErrorHandler(CPLErr eclass, int code, const char *msg )
+ {
+ /*
+- ** Generally we want to supress error reporting if we have exceptions
++ ** Generally we want to suppress error reporting if we have exceptions
+ ** enabled as the error message will be in the exception thrown in
+ ** Python.
+ */
+--- a/swig/python/scripts/gdal_fillnodata.dox
++++ b/swig/python/scripts/gdal_fillnodata.dox
+@@ -22,7 +22,7 @@ docs.
+ <dl>
+
+ <dt> <b>-q</b>:</dt><dd>
+-The script runs in quiet mode. The progress monitor is supressed and routine
++The script runs in quiet mode. The progress monitor is suppressed and routine
+ messages are not displayed.
+
+ <dt> <b>-md</b> <i>max_distance</i>:</dt><dd>
+--- a/swig/python/scripts/gdal_polygonize.dox
++++ b/swig/python/scripts/gdal_polygonize.dox
+@@ -60,7 +60,7 @@ file to be created. Default is GML.
+ </dd>
+
+ <dt> <b>-q</b>:</dt><dd>
+-The script runs in quiet mode. The progress monitor is supressed and routine
++The script runs in quiet mode. The progress monitor is suppressed and routine
+ messages are not displayed.
+ </dd>
+
+--- a/swig/python/scripts/gdal_sieve.dox
++++ b/swig/python/scripts/gdal_sieve.dox
+@@ -23,7 +23,7 @@ docs.
+ <dl>
+
+ <dt> <b>-q</b>:</dt><dd>
+-The script runs in quiet mode. The progress monitor is supressed and routine
++The script runs in quiet mode. The progress monitor is suppressed and routine
+ messages are not displayed.
+
+ <dt> <b>-st</b> <i>threshold</i>:</dt><dd>
diff --git a/debian/patches/usefull-typo b/debian/patches/usefull-typo
index 81e3d48..8be69ea 100644
--- a/debian/patches/usefull-typo
+++ b/debian/patches/usefull-typo
@@ -50,6 +50,22 @@ Last-Update: 2013-10-11
(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.
+@@ -319,7 +319,7 @@ We can use the 'identity' setting to spe
+ This setting should be used along with the -append setting.</dd>
+ <dt> <b>-addfields</b>:</dt><dd>(starting with GDAL 1.11) This is a
specialized version of
+ -append. Contrary to -append, -addfields has the effect of adding, to
existing target layers,
+-the new fields found in source layers. This option is usefull when merging
files that have non-strictly
++the new fields found in source layers. This option is useful when merging
files that have non-strictly
+ identical structures.
+ This might not work for output formats that don't support adding fields to
existing non-empty layers.</dd>
+ </dl>
+@@ -527,4 +527,4 @@ Dmitry Baryshnikov <poli...@mail.ru>
+
+ \endif
+
+-*/
+\ No newline at end of file
++*/
--- a/doc/gdal_drivertut.dox
+++ b/doc/gdal_drivertut.dox
@@ -447,7 +447,7 @@ void GDALRegister_JDEM()
@@ -187,6 +203,15 @@ Last-Update: 2013-10-11
.IP "\fB\fB-dim\fP\fI val\fP:\fP" 1c
(starting with GDAL 1.10) Force the coordinate dimension to val (valid values
are 2 or 3). This affects both the layer geometry type, and feature geometries.
Starting with GDAL 1.11, the value can be set to 'layer_dim' to instruct
feature geometries to be promoted to the coordinate dimension declared by the
layer.
.IP "\fB\fB-a_srs\fP\fI srs_def\fP:\fP" 1c
+@@ -155,7 +155,7 @@ To be combined with -splitlistfields to
+ .IP "\fB\fB-fieldmap\fP:\fP" 1c
+ (starting with GDAL 1.10.0) Specifies the list of field indexes to be copied
from the source to the destination. The (n)th value specified in the list is
the index of the field in the target layer definition in which the n(th) field
of the source layer must be copied. Index count starts at zero. There must be
exactly as many values in the list as the count of the fields in the source
layer. We can use the 'identity' setting to specify that the fields should be
transferred by using the s [...]
+ .IP "\fB\fB-addfields\fP:\fP" 1c
+-(starting with GDAL 1.11) This is a specialized version of -append. Contrary
to -append, -addfields has the effect of adding, to existing target layers, the
new fields found in source layers. This option is usefull when merging files
that have non-strictly identical structures. This might not work for output
formats that don't support adding fields to existing non-empty layers.
++(starting with GDAL 1.11) This is a specialized version of -append. Contrary
to -append, -addfields has the effect of adding, to existing target layers, the
new fields found in source layers. This option is useful when merging files
that have non-strictly identical structures. This might not work for output
formats that don't support adding fields to existing non-empty layers.
+ .PP
+ .SH "PERFORMANCE HINTS"
+ .PP
--- a/ogr/ogrgeometryfactory.cpp
+++ b/ogr/ogrgeometryfactory.cpp
@@ -1039,7 +1039,7 @@ typedef enum
@@ -550,3 +575,14 @@ Last-Update: 2013-10-11
use the dataset in update-mode. In which case, updated information will go
into PAM .aux.xml files.</dd>
+--- a/man/man1/gdal_edit.1
++++ b/man/man1/gdal_edit.1
+@@ -27,7 +27,7 @@ It works only with raster formats that s
+ Gives a brief usage message for the generic GDAL commandline options and
exit.
+ .PP
+ .IP "\fB\fB-ro\fP:\fP" 1c
+-(GDAL >= 1.11) Open the dataset in read-only. Might be usefull for drivers
refusing to use the dataset in update-mode. In which case, updated information
will go into PAM .aux.xml files.
++(GDAL >= 1.11) Open the dataset in read-only. Might be useful for drivers
refusing to use the dataset in update-mode. In which case, updated information
will go into PAM .aux.xml files.
+ .PP
+ .IP "\fB\fB-a_srs\fP \fIsrs_def\fP:\fP" 1c
+ .PP
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/gdal.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
