[gdal] 06/07: Refresh patches.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Jan 22 14:09:36 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository gdal.
commit b8c104ffd42528a9b9dcbe5edaa27c61686ff1b1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Jan 22 13:12:41 2016 +0100
Refresh patches.
---
debian/changelog | 1 +
debian/patches/accomodate-typo | 6 +++---
debian/patches/consistant-typo | 18 +++++++++---------
debian/patches/developement-typo | 2 +-
debian/patches/explicitely-typo | 10 +++++-----
debian/patches/inconsistant-typo | 4 ++--
debian/patches/initalize-typo | 2 +-
debian/patches/ressource-typo | 28 ++++++++++++++--------------
debian/patches/supress-typo | 14 +++++++-------
debian/patches/usefull-typo | 22 +++++++++++-----------
10 files changed, 54 insertions(+), 53 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7fb17ac..5a12af8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gdal (1.11.4~rc1+dfsg-1) UNRELEASED; urgency=medium
* New upstream release candidate.
* Update watch file for 1.11.4 pre-releases.
+ * Refresh patches.
-- Bas Couwenberg <sebastic at debian.org> Fri, 22 Jan 2016 12:38:00 +0100
diff --git a/debian/patches/accomodate-typo b/debian/patches/accomodate-typo
index 49bcee1..d6d5ac6 100644
--- a/debian/patches/accomodate-typo
+++ b/debian/patches/accomodate-typo
@@ -5,7 +5,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/NEWS
+++ b/NEWS
-@@ -4141,7 +4141,7 @@ GeoTIFF driver :
+@@ -4243,7 +4243,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)
@@ -27,7 +27,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
rmax=rmax*dscale;
--- a/frmts/gtiff/geotiff.cpp
+++ b/frmts/gtiff/geotiff.cpp
-@@ -1555,7 +1555,7 @@ CPLErr GTiffRasterBand::FillCacheForOthe
+@@ -1556,7 +1556,7 @@ CPLErr GTiffRasterBand::FillCacheForOthe
/* and O(nBands^2) performance ! */
/* */
/* If there are many bands and the block cache size is not big */
@@ -49,7 +49,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/man/man1/gdalwarp.1
+++ b/man/man1/gdalwarp.1
-@@ -122,7 +122,7 @@ The source file name(s)\&.
+@@ -121,7 +121,7 @@ The source file name(s)\&.
The destination file name\&.
.PP
.PP
diff --git a/debian/patches/consistant-typo b/debian/patches/consistant-typo
index fe305f5..178d7ed 100644
--- a/debian/patches/consistant-typo
+++ b/debian/patches/consistant-typo
@@ -5,7 +5,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/NEWS
+++ b/NEWS
-@@ -2184,7 +2184,7 @@ Utilities:
+@@ -2286,7 +2286,7 @@ Utilities:
* Add gdal_ls.py and gdal_cp.py as Python samples
* Add new sample utility, gdal_edit.py, to edit in place various information of an existing GDAL dataset (projection, geotransform, nodata, metadata) (#4220)
* gdalcopyproj.py: make it copy GCPs too
@@ -14,7 +14,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* Add --pause for convenient debugging, document it and --locale
Multi-driver topics:
-@@ -2642,7 +2642,7 @@ Utilities:
+@@ -2744,7 +2744,7 @@ Utilities:
* ogr2ogr: take into account fields specified in the -where clause in combinations with -select to create the correct list of fields to pass to SetIgnoredFields() (#4015)
* ogr2ogr: fix -zfield option so that the modified geometry properly reports coordinate dimension = 3. Also avoids it to be in the list of ignored field names
* ogr2ogr: add -simplify option to simplify geometries
@@ -23,7 +23,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* ogrinfo/ogr2ogr: exit when SetAttributeFilter() fails, instead of silently going on (#4261)
Multi driver topics:
-@@ -3148,7 +3148,7 @@ Utilities :
+@@ -3250,7 +3250,7 @@ Utilities :
to align on a standard grid (#3772)
AAIGRID driver:
@@ -32,7 +32,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
GDT_Float32 case; small optimization to avoid reading the first 100K when
we know that the datatype is already Float32
* Allow reading files where decimal separator is comma (#3668)
-@@ -3255,7 +3255,7 @@ GTX driver:
+@@ -3357,7 +3357,7 @@ GTX driver:
* Read NOAA .gtx vertical datum shift files.
GXF driver:
@@ -41,7 +41,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
GDT_Float32 case
* Introduce a GXF_DATATYPE configuration option that can be set to Float64
* Use GDALGetScanline() instead of GDALGetRawScanline() so that #SENS
-@@ -3488,7 +3488,7 @@ Core:
+@@ -3590,7 +3590,7 @@ Core:
OGR_G_SymDifference() and OGR_G_UnionCascaded()
* Add C function: OGR_F_StealGeometry()
* Move Centroid() method from OGRPolygon to OGRGeometry base class to be able
@@ -50,7 +50,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
ST_Centroid() capabilities and the underlying GEOS method
* Make the GetStyleTable() SetStyleTable() SetStyleTableDirectly() methods on
datasources and layers virtual (#2978)
-@@ -4579,7 +4579,7 @@ General:
+@@ -4681,7 +4681,7 @@ General:
osr.ImportFromMICoordSys(), osr.ExportToMICoordSys(), SpatialReference.Clone()
osr.EPSGTreatsAsLatLong(), osr.ImportFromEPSGA()
* Make resampling an optionnal parameter for gdal.RegenerateOverview(),
@@ -59,7 +59,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* NONNULL checks have been added to check various arguments of methods
* add missing constants : DCAP_VIRTUALIO, color interpretations, OGR constants
-@@ -4758,7 +4758,7 @@ Utilities:
+@@ -4860,7 +4860,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)
@@ -114,7 +114,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/frmts/bsb/bsb_read.c
+++ b/frmts/bsb/bsb_read.c
-@@ -644,7 +644,7 @@ static int BSBReadHeaderLine( BSBInfo *p
+@@ -631,7 +631,7 @@ static int BSBReadHeaderLine( BSBInfo *p
/* BSBSeekAndCheckScanlineNumber() */
/* */
/* Seek to the beginning of the scanline and check that the */
@@ -123,7 +123,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
/* */
/* @param nScanline zero based line number */
/************************************************************************/
-@@ -769,7 +769,7 @@ int BSBReadScanline( BSBInfo *psInfo, in
+@@ -756,7 +756,7 @@ int BSBReadScanline( BSBInfo *psInfo, in
/* -------------------------------------------------------------------- */
/* Seek to the beginning of the scanline and check that the */
diff --git a/debian/patches/developement-typo b/debian/patches/developement-typo
index 4c8d247..59bacd2 100644
--- a/debian/patches/developement-typo
+++ b/debian/patches/developement-typo
@@ -5,7 +5,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/NEWS
+++ b/NEWS
-@@ -1259,7 +1259,7 @@ Build(Unix):
+@@ -1361,7 +1361,7 @@ Build(Unix):
* New optional dependencies : libpcre (for regular expressions support in SQLite), libxml2 (validation of GML files)
* --with-python: make it work with python3, and also accept path to python binary as argument of --with-python (#4725)
* Use nc-config to detect netcdf compilation and linking parameters (#4424)
diff --git a/debian/patches/explicitely-typo b/debian/patches/explicitely-typo
index 0770966..e0a89ed 100644
--- a/debian/patches/explicitely-typo
+++ b/debian/patches/explicitely-typo
@@ -5,7 +5,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/NEWS
+++ b/NEWS
-@@ -1787,7 +1787,7 @@ GML driver:
+@@ -1889,7 +1889,7 @@ GML driver:
* Allow reading srsDimension attribute when set on LineString element, and not on posList (#4663)
* Partial support for reading GML 3.3 compat encoding profile, limited to <gmlce:SimplePolygon>, <gmlce:SimpleRectangle>, <gmlce:SimpleTriangle>, <gmlce:SimpleMultiPoint> elements
* Support WFS GetFeature response document to be piped and opened with /vsistdin/
@@ -14,7 +14,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* Improve detection of extent and srs for WFS 2.0
* Allow ISO-8859-15 encoded files to be used by Expat parser (#4829)
* Handle CompositeCurve like MultiCurve (for NAS)
-@@ -2588,7 +2588,7 @@ Core:
+@@ -2690,7 +2690,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)
@@ -172,7 +172,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
// in the list.
size_t nLen = strlen(papszLayers[i]);
int bFoundChildLayer = FALSE;
-@@ -4970,7 +4970,7 @@ CPLErr PDFDataset::SetGeoTransform(doubl
+@@ -4985,7 +4985,7 @@ CPLErr PDFDataset::SetGeoTransform(doubl
bGeoTransformValid = TRUE;
bProjDirty = TRUE;
@@ -181,7 +181,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
if (!bNeatLineDirty)
SetMetadataItem("NEATLINE", NULL);
return CE_None;
-@@ -5153,7 +5153,7 @@ CPLErr PDFDataset::SetGCPs( int nGCPCoun
+@@ -5168,7 +5168,7 @@ CPLErr PDFDataset::SetGCPs( int nGCPCoun
bProjDirty = TRUE;
@@ -647,7 +647,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
pszFormat = papszArgv[++iArg];
}
else if( EQUAL(papszArgv[iArg],"-dsco") )
-@@ -1566,7 +1566,7 @@ int main( int nArgc, char ** papszArgv )
+@@ -1571,7 +1571,7 @@ int main( int nArgc, char ** papszArgv )
/* -------------------------------------------------------------------- */
if( !bUpdate )
{
diff --git a/debian/patches/inconsistant-typo b/debian/patches/inconsistant-typo
index 1209254..3ba5f6c 100644
--- a/debian/patches/inconsistant-typo
+++ b/debian/patches/inconsistant-typo
@@ -71,7 +71,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
{
--- a/frmts/nitf/nitffile.c
+++ b/frmts/nitf/nitffile.c
-@@ -2626,7 +2626,7 @@ char **NITFGenericMetadataReadTRE(char *
+@@ -2638,7 +2638,7 @@ char **NITFGenericMetadataReadTRE(char *
if (bError == FALSE && nTreLength > 0 && nTreOffset != nTreLength)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -80,7 +80,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
pszTREName );
}
if (nTreOffset < nTRESize)
-@@ -2762,7 +2762,7 @@ CPLXMLNode* NITFCreateXMLTre(NITFFile* p
+@@ -2774,7 +2774,7 @@ CPLXMLNode* NITFCreateXMLTre(NITFFile* p
if (bError == FALSE && nTreLength > 0 && nTreOffset != nTreLength)
{
CPLError( CE_Warning, CPLE_AppDefined,
diff --git a/debian/patches/initalize-typo b/debian/patches/initalize-typo
index 503b74e..c85f0ee 100644
--- a/debian/patches/initalize-typo
+++ b/debian/patches/initalize-typo
@@ -16,7 +16,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
% gdal_merge.py -init "0 0 255" -o out.tif in1.tif in2.tif
--- a/man/man1/gdal_merge.1
+++ b/man/man1/gdal_merge.1
-@@ -64,7 +64,7 @@ Create an image with the pixels in all b
+@@ -62,7 +62,7 @@ Create an image with the pixels in all b
.fi
.PP
.PP
diff --git a/debian/patches/ressource-typo b/debian/patches/ressource-typo
index 3a38a01..6695811 100644
--- a/debian/patches/ressource-typo
+++ b/debian/patches/ressource-typo
@@ -5,7 +5,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/NEWS
+++ b/NEWS
-@@ -2533,7 +2533,7 @@ USGSDEM driver:
+@@ -2635,7 +2635,7 @@ USGSDEM driver:
VRT driver:
* Implement VRTDataset::IRasterIO() that can delegate to source Dataset::RasterIO() in particular cases
* Implement GetMinimum() and GetMaximum()
@@ -14,7 +14,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* VRTComplexSource: correctly deal with complex data type (#3977)
* Fix 2 segfaults related to using '<VRTDataset', but with invalid XML, as the target filename of VRTDataset::Create()
* Fix 'VRTDerivedRasterBand with ComplexSource and nodata value yields potentially uninitialized buffer' (#4045)
-@@ -3055,7 +3055,7 @@ Port:
+@@ -3157,7 +3157,7 @@ Port:
Core:
* RFC 24: progressive/async raster reading
* On Unix, add capability of opening the target of a symlink through GDALOpen()
@@ -23,7 +23,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
GDAL virtual filenames in software offering only file explorers (#3902)
* Assume anything less than 100000 for GDAL_CACHEMAX is measured in metabytes.
* Read cartesian coordinates if applicable in GDALLoadOziMapFile().
-@@ -3475,7 +3475,7 @@ Core:
+@@ -3577,7 +3577,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()
@@ -56,7 +56,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
// We also have an issue with ECW SDK 5.0 and ECW files on Linux when
--- a/frmts/nitf/nitffile.c
+++ b/frmts/nitf/nitffile.c
-@@ -2205,7 +2205,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2217,7 +2217,7 @@ static char** NITFGenericMetadataReadTRE
{
*pbError = TRUE;
CPLError( CE_Warning, CPLE_AppDefined,
@@ -65,7 +65,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
pszTREName );
break;
}
-@@ -2229,7 +2229,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2241,7 +2241,7 @@ static char** NITFGenericMetadataReadTRE
if (nIterations < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -74,7 +74,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
"invalid 'counter' %s",
pszTREName, pszCounter );
*pbError = TRUE;
-@@ -2250,7 +2250,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2262,7 +2262,7 @@ static char** NITFGenericMetadataReadTRE
if (NPART < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -83,7 +83,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
"invalid 'counter' %s",
pszTREName, "NPART" );
*pbError = TRUE;
-@@ -2268,7 +2268,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2280,7 +2280,7 @@ static char** NITFGenericMetadataReadTRE
if (NUMOPG < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -92,7 +92,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
"invalid 'counter' %s",
pszTREName, "NUMOPG" );
*pbError = TRUE;
-@@ -2290,7 +2290,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2302,7 +2302,7 @@ static char** NITFGenericMetadataReadTRE
if (NPAR < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -101,7 +101,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
"invalid 'counter' %s",
pszTREName, "NPAR" );
*pbError = TRUE;
-@@ -2299,7 +2299,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2311,7 +2311,7 @@ static char** NITFGenericMetadataReadTRE
if (NPARO < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -110,7 +110,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
"invalid 'counter' %s",
pszTREName, "NPAR0" );
*pbError = TRUE;
-@@ -2317,7 +2317,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2329,7 +2329,7 @@ static char** NITFGenericMetadataReadTRE
if (NPLN < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -119,7 +119,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
"invalid 'counter' %s",
pszTREName, "NPLN" );
*pbError = TRUE;
-@@ -2339,7 +2339,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2351,7 +2351,7 @@ static char** NITFGenericMetadataReadTRE
if (NXPTS < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -128,7 +128,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
"invalid 'counter' %s",
pszTREName, "NXPTS" );
*pbError = TRUE;
-@@ -2348,7 +2348,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2360,7 +2360,7 @@ static char** NITFGenericMetadataReadTRE
if (NYPTS < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -137,7 +137,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
"invalid 'counter' %s",
pszTREName, "NYPTS" );
*pbError = TRUE;
-@@ -2359,7 +2359,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2371,7 +2371,7 @@ static char** NITFGenericMetadataReadTRE
else
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -146,7 +146,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
"missing or invalid 'counter' or 'iterations' or 'formula'",
pszTREName );
*pbError = TRUE;
-@@ -2544,7 +2544,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2556,7 +2556,7 @@ static char** NITFGenericMetadataReadTRE
else
{
CPLError( CE_Warning, CPLE_AppDefined,
diff --git a/debian/patches/supress-typo b/debian/patches/supress-typo
index 2361c1f..1a77782 100644
--- a/debian/patches/supress-typo
+++ b/debian/patches/supress-typo
@@ -25,7 +25,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
<dt> <b>-dsco</b> <em>NAME=VALUE</em>:</dt><dd> Dataset creation option
--- a/NEWS
+++ b/NEWS
-@@ -2170,7 +2170,7 @@ Utilities:
+@@ -2272,7 +2272,7 @@ Utilities:
* gdalwarp: speed-up when using -tps with large number of GCPs
* gdalwarp: add support for optional use of libarmadillo to speed-up matrix inversion in -tps mode
* gdalwarp: detect situations where the user will override the source file
@@ -34,7 +34,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* gdal_rasterize: fix half pixel shift when rasterizing points; make gdal_rasterize utility increase the computed raster extent by a half-pixel for point layers (#3774)
* gdal_rasterize: when source datasource has a single layer, use it implicitely if none of -l or -sql is specified
* nearblack: add -color option (#4085)
-@@ -3864,7 +3864,7 @@ Python bindings:
+@@ -3966,7 +3966,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
@@ -160,7 +160,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
SetMOFlags( nSavedMOFlags | GMO_IGNORE_UNIMPLEMENTED );
--- a/man/man1/gdal_fillnodata.1
+++ b/man/man1/gdal_fillnodata.1
-@@ -21,7 +21,7 @@ The gdal_fillnodata\&.py script fills se
+@@ -20,7 +20,7 @@ The gdal_fillnodata\&.py script fills se
Additional details on the algorithm are available in the GDALFillNodata() docs\&.
.PP
.IP "\fB\fB-q\fP:\fP" 1c
@@ -171,7 +171,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
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
-@@ -49,7 +49,7 @@ The name of the layer created to hold th
+@@ -48,7 +48,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
@@ -182,7 +182,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
.PP
--- a/man/man1/gdal_sieve.1
+++ b/man/man1/gdal_sieve.1
-@@ -20,7 +20,7 @@ The gdal_sieve\&.py script removes raste
+@@ -19,7 +19,7 @@ The gdal_sieve\&.py script removes raste
Additional details on the algorithm are available in the GDALSieveFilter() docs\&.
.PP
.IP "\fB\fB-q\fP:\fP" 1c
@@ -193,7 +193,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
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
-@@ -27,7 +27,7 @@ Open the data source in read-only mode\&
+@@ -24,7 +24,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
@@ -480,7 +480,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
<dt> <b>-st</b> <i>threshold</i>:</dt><dd>
--- a/man/man1/ogrlineref.1
+++ b/man/man1/ogrlineref.1
-@@ -40,7 +40,7 @@ Show the usage\&.
+@@ -39,7 +39,7 @@ Show the usage\&.
.IP "\fB\fB-progress\fP:\fP" 1c
Show progress\&.
.IP "\fB\fB-quiet\fP:\fP" 1c
diff --git a/debian/patches/usefull-typo b/debian/patches/usefull-typo
index 9bceb47..2b56150 100644
--- a/debian/patches/usefull-typo
+++ b/debian/patches/usefull-typo
@@ -5,7 +5,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/NEWS
+++ b/NEWS
-@@ -3037,7 +3037,7 @@ Port:
+@@ -3139,7 +3139,7 @@ Port:
- /vsitar/ : to read in .tar or .tgz/.tar.gz files
* Add C API to create ZIP files
* Add support for writable /vsizip/
@@ -14,7 +14,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
doing backward seeks by a few bytes on underlying file handles for which
backwardseeks are very slow, such as GZip handle
* Add service for base64 decoding
-@@ -3055,7 +3055,7 @@ Port:
+@@ -3157,7 +3157,7 @@ Port:
Core:
* RFC 24: progressive/async raster reading
* On Unix, add capability of opening the target of a symlink through GDALOpen()
@@ -23,7 +23,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
GDAL virtual filenames in software offering only file explorers (#3902)
* Assume anything less than 100000 for GDAL_CACHEMAX is measured in metabytes.
* Read cartesian coordinates if applicable in GDALLoadOziMapFile().
-@@ -3475,7 +3475,7 @@ Core:
+@@ -3577,7 +3577,7 @@ Core:
* Add OGRLayer::GetName() and OGRLayer::GetGeomType() virtual methods,
and their C and SWIG mappings (#3719)
* On Unix, add capability of opening the target of a symlink through OGROpen()
@@ -32,7 +32,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
GDAL virtual filenames in software offering only file explorers (#3902)
* Expat based XML readers : add support for reading files with Windows-1252
encoding
-@@ -3745,7 +3745,7 @@ PostgreSQL driver:
+@@ -3847,7 +3847,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.
@@ -90,7 +90,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
uint16 nPlanarConfig;
uint16 nSamplesPerPixel;
-@@ -776,7 +776,7 @@ GTiffRasterBand::~GTiffRasterBand()
+@@ -777,7 +777,7 @@ GTiffRasterBand::~GTiffRasterBand()
/* Reads directly bytes from the file using ReadMultiRange(), and by-pass */
/* block reading. Restricted to simple TIFF configurations (un-tiled, */
@@ -99,7 +99,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
/* sub-windows of data on a large /vsicurl dataset). */
CPLErr GTiffRasterBand::DirectIO( GDALRWFlag eRWFlag,
-@@ -8681,7 +8681,7 @@ TIFF *GTiffDataset::CreateLL( const char
+@@ -8716,7 +8716,7 @@ TIFF *GTiffDataset::CreateLL( const char
}
/* Set the compression method before asking the default strip size */
@@ -108,7 +108,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
/* the default strip size is 8 or 16 depending on the photometric value */
TIFFSetField( hTIFF, TIFFTAG_COMPRESSION, nCompression );
-@@ -9169,7 +9169,7 @@ GTiffDataset::CreateCopy( const char * p
+@@ -9204,7 +9204,7 @@ GTiffDataset::CreateCopy( const char * p
#endif
/* Note: JPEG_DIRECT_COPY is not defined by default, because it is mainly */
@@ -196,7 +196,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* matching if no exact matching is possible.
--- a/man/man1/ogr2ogr.1
+++ b/man/man1/ogr2ogr.1
-@@ -86,7 +86,7 @@ Layer creation option (format specific)
+@@ -81,7 +81,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
@@ -205,7 +205,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
.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
-@@ -152,7 +152,7 @@ To be combined with -splitlistfields to
+@@ -147,7 +147,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 [...]
.IP "\fB\fB-addfields\fP:\fP" 1c
@@ -471,7 +471,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
{
--- a/port/cpl_string.cpp
+++ b/port/cpl_string.cpp
-@@ -2170,7 +2170,7 @@ size_t CPLStrlcat(char* pszDest, const c
+@@ -2185,7 +2185,7 @@ size_t CPLStrlcat(char* pszDest, const c
* the specified number of bytes.
*
* The CPLStrnlen() function returns MIN(strlen(pszStr), nMaxLen).
@@ -579,7 +579,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/man/man1/gdal_edit.1
+++ b/man/man1/gdal_edit.1
-@@ -24,7 +24,7 @@ It works only with raster formats that s
+@@ -23,7 +23,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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git
More information about the Pkg-grass-devel
mailing list