[gdal] 04/06: Refresh patches.

Sun Oct 12 13:59:05 UTC 2014

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch experimental
in repository gdal.

commit 1782267f1d820606ca4c3344b0287588ce8148d1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Oct 11 15:26:40 2014 +0200

    Refresh patches.
---
 debian/changelog                 |  1 +
 debian/patches/accomodate-typo   |  4 ++--
 debian/patches/consistant-typo   | 16 ++++++++--------
 debian/patches/developement-typo |  2 +-
 debian/patches/explicitely-typo  | 14 +++++++-------
 debian/patches/hdf4              | 10 +++++-----
 debian/patches/inconsistant-typo |  4 ++--
 debian/patches/ogdi              |  2 +-
 debian/patches/paramters-typo    | 36 ++++++++++++++++++------------------
 debian/patches/recommanded-typo  |  2 +-
 debian/patches/ressource-typo    |  8 ++++----
 debian/patches/spatialite        |  6 +++---
 debian/patches/supress-typo      | 10 +++++-----
 debian/patches/transfering-typo  |  6 +++---
 debian/patches/usefull-typo      | 30 +++++++++++++++---------------
 15 files changed, 76 insertions(+), 75 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8fbf40c..82f408f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gdal (1.11.1+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sat, 11 Oct 2014 14:33:44 +0200
 
diff --git a/debian/patches/accomodate-typo b/debian/patches/accomodate-typo
index 01c55b9..745f47f 100644
--- a/debian/patches/accomodate-typo
+++ b/debian/patches/accomodate-typo
@@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
 Last-Update: 2013-10-11
 --- a/NEWS
 +++ b/NEWS
-@@ -3665,7 +3665,7 @@ GeoTIFF driver :
+@@ -3875,7 +3875,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)
@@ -25,7 +25,7 @@ Last-Update: 2013-10-11
             rmax=rmax*dscale;
 --- a/frmts/gtiff/geotiff.cpp
 +++ b/frmts/gtiff/geotiff.cpp
-@@ -1524,7 +1524,7 @@ CPLErr GTiffRasterBand::FillCacheForOthe
+@@ -1554,7 +1554,7 @@ CPLErr GTiffRasterBand::FillCacheForOthe
  /*      and O(nBands^2) performance !                                   */
  /*                                                                      */
  /*      If there are many bands and the block cache size is not big     */
diff --git a/debian/patches/consistant-typo b/debian/patches/consistant-typo
index bd6c2d1..6bd0be1 100644
--- a/debian/patches/consistant-typo
+++ b/debian/patches/consistant-typo
@@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
 Last-Update: 2013-10-11
 --- a/NEWS
 +++ b/NEWS
-@@ -1708,7 +1708,7 @@ Utilities:
+@@ -1918,7 +1918,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
@@ -12,7 +12,7 @@ Last-Update: 2013-10-11
   * Add --pause for convenient debugging, document it and --locale
  
  Multi-driver topics:
-@@ -2166,7 +2166,7 @@ Utilities:
+@@ -2376,7 +2376,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
@@ -21,7 +21,7 @@ Last-Update: 2013-10-11
   * ogrinfo/ogr2ogr: exit when SetAttributeFilter() fails, instead of silently going on (#4261)
  
  Multi driver topics:
-@@ -2672,7 +2672,7 @@ Utilities :
+@@ -2882,7 +2882,7 @@ Utilities :
     to align on a standard grid (#3772)
  
  AAIGRID driver:
@@ -30,7 +30,7 @@ Last-Update: 2013-10-11
     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)
-@@ -2779,7 +2779,7 @@ GTX driver:
+@@ -2989,7 +2989,7 @@ GTX driver:
   * Read NOAA .gtx vertical datum shift files.
  
  GXF driver:
@@ -39,7 +39,7 @@ Last-Update: 2013-10-11
     GDT_Float32 case
   * Introduce a GXF_DATATYPE configuration option that can be set to Float64
   * Use GDALGetScanline() instead of GDALGetRawScanline() so that #SENS
-@@ -3012,7 +3012,7 @@ Core:
+@@ -3222,7 +3222,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
@@ -48,7 +48,7 @@ Last-Update: 2013-10-11
     ST_Centroid() capabilities and the underlying GEOS method
   * Make the GetStyleTable() SetStyleTable() SetStyleTableDirectly() methods on
     datasources and layers virtual (#2978)
-@@ -4103,7 +4103,7 @@ General:
+@@ -4313,7 +4313,7 @@ General:
          osr.ImportFromMICoordSys(), osr.ExportToMICoordSys(), SpatialReference.Clone()
          osr.EPSGTreatsAsLatLong(), osr.ImportFromEPSGA()
   * Make resampling an optionnal parameter for gdal.RegenerateOverview(),
@@ -57,7 +57,7 @@ Last-Update: 2013-10-11
   * NONNULL checks have been added to check various arguments of methods
   * add missing constants : DCAP_VIRTUALIO, color interpretations, OGR constants
  
-@@ -4282,7 +4282,7 @@ Utilities:
+@@ -4492,7 +4492,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)
@@ -163,7 +163,7 @@ Last-Update: 2013-10-11
                      }
 --- a/gcore/gdalpamrasterband.cpp
 +++ b/gcore/gdalpamrasterband.cpp
-@@ -999,7 +999,7 @@ PamParseHistogram( CPLXMLNode *psHistIte
+@@ -1002,7 +1002,7 @@ PamParseHistogram( CPLXMLNode *psHistIte
      if( strlen(pszHistCounts) < 2 * (size_t)(*pnBuckets) -1 )
      {
          CPLError(CE_Failure, CPLE_AppDefined,
diff --git a/debian/patches/developement-typo b/debian/patches/developement-typo
index dfe73fc..55b3b65 100644
--- a/debian/patches/developement-typo
+++ b/debian/patches/developement-typo
@@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
 Last-Update: 2013-10-11
 --- a/NEWS
 +++ b/NEWS
-@@ -783,7 +783,7 @@ Build(Unix):
+@@ -993,7 +993,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 dc00c26..38a5fb1 100644
--- a/debian/patches/explicitely-typo
+++ b/debian/patches/explicitely-typo
@@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
 Last-Update: 2013-10-11
 --- a/NEWS
 +++ b/NEWS
-@@ -1311,7 +1311,7 @@ GML driver:
+@@ -1521,7 +1521,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/
@@ -12,7 +12,7 @@ Last-Update: 2013-10-11
   * 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)
-@@ -2112,7 +2112,7 @@ Core:
+@@ -2322,7 +2322,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)
@@ -61,7 +61,7 @@ Last-Update: 2013-10-11
      else
 --- a/frmts/ctg/ctgdataset.cpp
 +++ b/frmts/ctg/ctgdataset.cpp
-@@ -361,7 +361,7 @@ int CTGDataset::Identify( GDALOpenInfo *
+@@ -360,7 +360,7 @@ int CTGDataset::Identify( GDALOpenInfo *
  
      GDALOpenInfo* poOpenInfoToDelete = NULL;
      /*  GZipped grid_cell.gz files are common, so automagically open them */
@@ -70,7 +70,7 @@ Last-Update: 2013-10-11
      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
+@@ -431,7 +431,7 @@ GDALDataset *CTGDataset::Open( GDALOpenI
      CPLString osFilename(poOpenInfo->pszFilename);
  
      /*  GZipped grid_cell.gz files are common, so automagically open them */
@@ -190,7 +190,7 @@ Last-Update: 2013-10-11
  
 --- a/frmts/xyz/xyzdataset.cpp
 +++ b/frmts/xyz/xyzdataset.cpp
-@@ -475,7 +475,7 @@ int XYZDataset::IdentifyEx( GDALOpenInfo
+@@ -479,7 +479,7 @@ int XYZDataset::IdentifyEx( GDALOpenInfo
  
      GDALOpenInfo* poOpenInfoToDelete = NULL;
      /*  GZipped .xyz files are common, so automagically open them */
@@ -199,7 +199,7 @@ Last-Update: 2013-10-11
      if (strlen(poOpenInfo->pszFilename) > 6 &&
          EQUAL(poOpenInfo->pszFilename + strlen(poOpenInfo->pszFilename) - 6, "xyz.gz") &&
          !EQUALN(poOpenInfo->pszFilename, "/vsigzip/", 9))
-@@ -607,7 +607,7 @@ GDALDataset *XYZDataset::Open( GDALOpenI
+@@ -611,7 +611,7 @@ GDALDataset *XYZDataset::Open( GDALOpenI
      CPLString osFilename(poOpenInfo->pszFilename);
  
      /*  GZipped .xyz files are common, so automagically open them */
@@ -210,7 +210,7 @@ Last-Update: 2013-10-11
          !EQUALN(poOpenInfo->pszFilename, "/vsigzip/", 9))
 --- a/gcore/gdaldataset.cpp
 +++ b/gcore/gdaldataset.cpp
-@@ -2385,7 +2385,7 @@ GDALDatasetH GDALOpenInternal( GDALOpenI
+@@ -2381,7 +2381,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
diff --git a/debian/patches/hdf4 b/debian/patches/hdf4
index 6a38cf7..82c3475 100644
--- a/debian/patches/hdf4
+++ b/debian/patches/hdf4
@@ -3,7 +3,7 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>, Alan Boudreault <aboudre
 Last-Update: 2012-02-01
 --- a/configure
 +++ b/configure
-@@ -21190,7 +21190,7 @@ fi
+@@ -21189,7 +21189,7 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mfhdf_SDreaddata" >&5
  $as_echo "$ac_cv_lib_mfhdf_SDreaddata" >&6; }
  if test "x$ac_cv_lib_mfhdf_SDreaddata" = xyes; then :
@@ -12,7 +12,7 @@ Last-Update: 2012-02-01
  else
    HDF_LIB_NAME=missing
  fi
-@@ -21250,7 +21250,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false
+@@ -21249,7 +21249,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -21,7 +21,7 @@ Last-Update: 2012-02-01
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -21281,7 +21281,7 @@ fi
+@@ -21280,7 +21280,7 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mfhdf_SDreaddata" >&5
  $as_echo "$ac_cv_lib_mfhdf_SDreaddata" >&6; }
  if test "x$ac_cv_lib_mfhdf_SDreaddata" = xyes; then :
@@ -30,7 +30,7 @@ Last-Update: 2012-02-01
  else
    HDF_LIB_NAME=missing
  fi
-@@ -21296,7 +21296,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false
+@@ -21295,7 +21295,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -39,7 +39,7 @@ Last-Update: 2012-02-01
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -21327,7 +21327,7 @@ fi
+@@ -21326,7 +21326,7 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mfhdf_SDreaddata" >&5
  $as_echo "$ac_cv_lib_mfhdf_SDreaddata" >&6; }
  if test "x$ac_cv_lib_mfhdf_SDreaddata" = xyes; then :
diff --git a/debian/patches/inconsistant-typo b/debian/patches/inconsistant-typo
index 7db598b..575d9e0 100644
--- a/debian/patches/inconsistant-typo
+++ b/debian/patches/inconsistant-typo
@@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
 Last-Update: 2013-10-11
 --- a/frmts/grib/degrib18/degrib/metaname.cpp
 +++ b/frmts/grib/degrib18/degrib/metaname.cpp
-@@ -838,7 +838,7 @@ GRIB2ParmTable MeteoAtmos[] = {
+@@ -840,7 +840,7 @@ GRIB2ParmTable MeteoAtmos[] = {
  /* 18 */    {"SNFALB", "Snow free albedo", "%", UC_NONE},
  };
  
@@ -47,7 +47,7 @@ Last-Update: 2013-10-11
     if (ParseTime (refTime, year, month, day, hour, min, 0) != 0) {
 --- a/frmts/mbtiles/mbtilesdataset.cpp
 +++ b/frmts/mbtiles/mbtilesdataset.cpp
-@@ -1736,7 +1736,7 @@ GDALDataset* MBTilesDataset::Open(GDALOp
+@@ -1746,7 +1746,7 @@ GDALDataset* MBTilesDataset::Open(GDALOp
          if (bHasMinMaxLevel && (nMinLevel < 0 || nMinLevel > nMaxLevel))
          {
              CPLError(CE_Failure, CPLE_AppDefined,
diff --git a/debian/patches/ogdi b/debian/patches/ogdi
index e33d9c9..8c1fdd7 100644
--- a/debian/patches/ogdi
+++ b/debian/patches/ogdi
@@ -3,7 +3,7 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
 Last-Update: 2010-05-13
 --- a/GDALmake.opt.in
 +++ b/GDALmake.opt.in
-@@ -372,7 +372,7 @@ endif
+@@ -371,7 +371,7 @@ endif
  # PCRaster support
  PCRASTER_SETTING	=	@PCRASTER_SETTING@
  
diff --git a/debian/patches/paramters-typo b/debian/patches/paramters-typo
index 47d5a16..0359424 100644
--- a/debian/patches/paramters-typo
+++ b/debian/patches/paramters-typo
@@ -3,24 +3,24 @@ Author: Bas Couwenger <sebastic at xs4all.nl>
 Last-Update: 2013-10-11
 --- a/frmts/georaster/georaster_wrapper.cpp
 +++ b/frmts/georaster/georaster_wrapper.cpp
-@@ -709,7 +709,7 @@ bool GeoRasterWrapper::Create( char* psz
-     nBandBlockSize   = nBandBlockSize   == 0 ? 1 : nBandBlockSize;
- 
-     //  -----------------------------------------------------------
--    //  Blocking storage paramters
-+    //  Blocking storage parameters
-     //  -----------------------------------------------------------
- 
-     CPLString sBlocking;
-@@ -780,7 +780,7 @@ bool GeoRasterWrapper::Create( char* psz
-     }
- 
-     //  -----------------------------------------------------------
--    //  Complete format paramters
-+    //  Complete format parameters
-     //  -----------------------------------------------------------
- 
-     if( poConnection->GetVersion() > 10 )
+@@ -718,7 +718,7 @@ bool GeoRasterWrapper::Create( char* psz
+     nBandBlockSize   = nBandBlockSize   == 0 ? 1 : nBandBlockSize;
+ 
+     //  -----------------------------------------------------------
+-    //  Blocking storage paramters
++    //  Blocking storage parameters
+     //  -----------------------------------------------------------
+ 
+     CPLString sBlocking;
+@@ -789,7 +789,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
 @@ -1178,7 +1178,7 @@ CPLXMLNode* XMLSpatialReference(OGRSpati
diff --git a/debian/patches/recommanded-typo b/debian/patches/recommanded-typo
index 9cf32c8..1103cd6 100644
--- a/debian/patches/recommanded-typo
+++ b/debian/patches/recommanded-typo
@@ -55,7 +55,7 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
          /* to realloc over that value */
          if (psCtxt->sRelation.nMembers >= psCtxt->nMembersAllocated)
          {
-@@ -2246,7 +2246,7 @@ OSMContext* OSM_Open( const char* pszFil
+@@ -2248,7 +2248,7 @@ OSMContext* OSM_Open( const char* pszFil
          psCtxt->nTagsAllocated = 256;
          psCtxt->pasTags = (OSMTag*) VSIMalloc(sizeof(OSMTag) * psCtxt->nTagsAllocated);
  
diff --git a/debian/patches/ressource-typo b/debian/patches/ressource-typo
index 8d36501..27bc888 100644
--- a/debian/patches/ressource-typo
+++ b/debian/patches/ressource-typo
@@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
 Last-Update: 2013-10-11
 --- a/NEWS
 +++ b/NEWS
-@@ -2057,7 +2057,7 @@ USGSDEM driver:
+@@ -2267,7 +2267,7 @@ USGSDEM driver:
  VRT driver:
   * Implement VRTDataset::IRasterIO() that can delegate to source Dataset::RasterIO() in particular cases
   * Implement GetMinimum() and GetMaximum()
@@ -12,7 +12,7 @@ Last-Update: 2013-10-11
   * 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)
-@@ -2579,7 +2579,7 @@ Port:
+@@ -2789,7 +2789,7 @@ Port:
  Core:
   * RFC 24: progressive/async raster reading
   * On Unix, add capability of opening the target of a symlink through GDALOpen()
@@ -21,7 +21,7 @@ Last-Update: 2013-10-11
     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().
-@@ -2999,7 +2999,7 @@ Core:
+@@ -3209,7 +3209,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()
@@ -195,7 +195,7 @@ Last-Update: 2013-10-11
  <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()
+@@ -270,7 +270,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
          {
diff --git a/debian/patches/spatialite b/debian/patches/spatialite
index 61570a1..a5c1931 100644
--- a/debian/patches/spatialite
+++ b/debian/patches/spatialite
@@ -3,7 +3,7 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
 Last-Update: 2011-05-12
 --- a/configure
 +++ b/configure
-@@ -25230,7 +25230,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
+@@ -25200,7 +25200,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -12,7 +12,7 @@ Last-Update: 2011-05-12
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -25284,7 +25284,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
+@@ -25254,7 +25254,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -21,7 +21,7 @@ Last-Update: 2011-05-12
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -25376,7 +25376,7 @@ if ${ac_cv_lib_spatialite_spatialite_tar
+@@ -25346,7 +25346,7 @@ if ${ac_cv_lib_spatialite_spatialite_tar
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
diff --git a/debian/patches/supress-typo b/debian/patches/supress-typo
index 5bbed76..4937309 100644
--- a/debian/patches/supress-typo
+++ b/debian/patches/supress-typo
@@ -23,7 +23,7 @@ Last-Update: 2014-01-11
  <dt> <b>-dsco</b> <em>NAME=VALUE</em>:</dt><dd> Dataset creation option 
 --- a/NEWS
 +++ b/NEWS
-@@ -1694,7 +1694,7 @@ Utilities:
+@@ -1904,7 +1904,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
@@ -32,7 +32,7 @@ Last-Update: 2014-01-11
   * 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:
+@@ -3598,7 +3598,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
@@ -158,7 +158,7 @@ Last-Update: 2014-01-11
      SetMOFlags( nSavedMOFlags | GMO_IGNORE_UNIMPLEMENTED );
 --- a/gcore/gdalpamrasterband.cpp
 +++ b/gcore/gdalpamrasterband.cpp
-@@ -481,7 +481,7 @@ CPLErr GDALPamRasterBand::CloneInfo( GDA
+@@ -485,7 +485,7 @@ CPLErr GDALPamRasterBand::CloneInfo( GDA
      PamInitialize();
  
  /* -------------------------------------------------------------------- */
@@ -359,7 +359,7 @@ Last-Update: 2014-01-11
  {
  }
  
-@@ -2325,7 +2325,7 @@ bool FGdbBaseLayer::OGRFeatureFromGdbRow
+@@ -2360,7 +2360,7 @@ bool FGdbBaseLayer::OGRFeatureFromGdbRow
  
              default:
              {
@@ -368,7 +368,7 @@ Last-Update: 2014-01-11
                  {
                      foundBadColumn = true;
                      CPLError( CE_Warning, CPLE_AppDefined,
-@@ -2337,7 +2337,7 @@ bool FGdbBaseLayer::OGRFeatureFromGdbRow
+@@ -2372,7 +2372,7 @@ bool FGdbBaseLayer::OGRFeatureFromGdbRow
      }
  
      if (foundBadColumn)
diff --git a/debian/patches/transfering-typo b/debian/patches/transfering-typo
index 996f248..8c6a004 100644
--- a/debian/patches/transfering-typo
+++ b/debian/patches/transfering-typo
@@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
 Last-Update: 2013-10-11
 --- a/frmts/grib/degrib18/degrib/grib2api.c
 +++ b/frmts/grib/degrib18/degrib/grib2api.c
-@@ -1081,7 +1081,7 @@ void unpk_g2ncep (sInt4 * kfildo, float
+@@ -1083,7 +1083,7 @@ void unpk_g2ncep (CPL_UNUSED sInt4 * kfi
        *ibitmap = 0;
     }
  
@@ -14,7 +14,7 @@ Last-Update: 2013-10-11
      * abort.  May need to revisit this behavior. */
 --- a/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
 +++ b/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
-@@ -3646,7 +3646,7 @@ int OGROSMDataSource::TransferToDiskIfNe
+@@ -3647,7 +3647,7 @@ int OGROSMDataSource::TransferToDiskIfNe
              CPLString osNewTmpDBName;
              osNewTmpDBName = CPLGenerateTempFilename("osm_tmp_nodes");
  
@@ -23,7 +23,7 @@ Last-Update: 2013-10-11
                       osNodesFilename.c_str(), osNewTmpDBName.c_str());
  
              if( CPLCopyFile( osNewTmpDBName, osNodesFilename ) != 0 )
-@@ -3725,7 +3725,7 @@ int OGROSMDataSource::TransferToDiskIfNe
+@@ -3726,7 +3726,7 @@ int OGROSMDataSource::TransferToDiskIfNe
  
              osNewTmpDBName = CPLGenerateTempFilename("osm_tmp");
  
diff --git a/debian/patches/usefull-typo b/debian/patches/usefull-typo
index 8be69ea..03583c5 100644
--- a/debian/patches/usefull-typo
+++ b/debian/patches/usefull-typo
@@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
 Last-Update: 2013-10-11
 --- a/NEWS
 +++ b/NEWS
-@@ -2561,7 +2561,7 @@ Port:
+@@ -2771,7 +2771,7 @@ Port:
      - /vsitar/ : to read in .tar or .tgz/.tar.gz files
   * Add C API to create ZIP files
   * Add support for writable /vsizip/
@@ -12,7 +12,7 @@ Last-Update: 2013-10-11
     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
-@@ -2579,7 +2579,7 @@ Port:
+@@ -2789,7 +2789,7 @@ Port:
  Core:
   * RFC 24: progressive/async raster reading
   * On Unix, add capability of opening the target of a symlink through GDALOpen()
@@ -21,7 +21,7 @@ Last-Update: 2013-10-11
     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().
-@@ -2999,7 +2999,7 @@ Core:
+@@ -3209,7 +3209,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()
@@ -30,7 +30,7 @@ Last-Update: 2013-10-11
     GDAL virtual filenames in software offering only file explorers (#3902)
   * Expat based XML readers : add support for reading files with Windows-1252
     encoding
-@@ -3269,7 +3269,7 @@ PostgreSQL driver:
+@@ -3479,7 +3479,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.
@@ -79,7 +79,7 @@ Last-Update: 2013-10-11
  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
-@@ -247,7 +247,7 @@ class GTiffDataset : public GDALPamDatas
+@@ -277,7 +277,7 @@ class GTiffDataset : public GDALPamDatas
  
      toff_t      nDirOffset;
      int		bBase;
@@ -88,7 +88,7 @@ Last-Update: 2013-10-11
  
      uint16	nPlanarConfig;
      uint16	nSamplesPerPixel;
-@@ -746,7 +746,7 @@ GTiffRasterBand::~GTiffRasterBand()
+@@ -776,7 +776,7 @@ GTiffRasterBand::~GTiffRasterBand()
  
  /* Reads directly bytes from the file using ReadMultiRange(), and by-pass */
  /* block reading. Restricted to simple TIFF configurations (un-tiled, */
@@ -97,7 +97,7 @@ Last-Update: 2013-10-11
  /* sub-windows of data on a large /vsicurl dataset). */
  
  CPLErr GTiffRasterBand::DirectIO( GDALRWFlag eRWFlag,
-@@ -8608,7 +8608,7 @@ TIFF *GTiffDataset::CreateLL( const char
+@@ -8649,7 +8649,7 @@ TIFF *GTiffDataset::CreateLL( const char
      }
  
      /* Set the compression method before asking the default strip size */
@@ -106,7 +106,7 @@ Last-Update: 2013-10-11
      /* the default strip size is 8 or 16 depending on the photometric value */
      TIFFSetField( hTIFF, TIFFTAG_COMPRESSION, nCompression );
  
-@@ -9092,7 +9092,7 @@ GTiffDataset::CreateCopy( const char * p
+@@ -9133,7 +9133,7 @@ GTiffDataset::CreateCopy( const char * p
      int bDirectCopyFromJPEG = FALSE;
  
      /* Note: JPEG_DIRECT_COPY is not defined by default, because it is mainly */
@@ -124,7 +124,7 @@ Last-Update: 2013-10-11
 -/* usefull for debugging purposes */
 +/* useful for debugging purposes */
  
- CPL_CVSID("$Id: gt_jpeg_copy.cpp 27044 2014-03-16 23:41:27Z rouault $");
+ CPL_CVSID("$Id: gt_jpeg_copy.cpp 27729 2014-09-24 00:40:16Z goatbar $");
  
 --- a/frmts/pcraster/pcrasterutil.cpp
 +++ b/frmts/pcraster/pcrasterutil.cpp
@@ -183,7 +183,7 @@ Last-Update: 2013-10-11
      int nRasterXSize = 0, nRasterYSize =0;
 --- a/gcore/gdalrasterband.cpp
 +++ b/gcore/gdalrasterband.cpp
-@@ -4761,7 +4761,7 @@ CPLErr CPL_STDCALL GDALCreateMaskBand( G
+@@ -4757,7 +4757,7 @@ CPLErr CPL_STDCALL GDALCreateMaskBand( G
  /**
   * \brief Compute translation table for color tables.
   *
@@ -269,7 +269,7 @@ Last-Update: 2013-10-11
  */
 --- a/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
 +++ b/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
-@@ -2677,7 +2677,7 @@ int OGROSMDataSource::Open( const char *
+@@ -2678,7 +2678,7 @@ int OGROSMDataSource::Open( const char *
          return FALSE;
      }
  
@@ -302,7 +302,7 @@ Last-Update: 2013-10-11
          /* 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
-@@ -764,7 +764,7 @@ OGRLayer * OGRSQLiteExecuteSQL( OGRDataS
+@@ -774,7 +774,7 @@ OGRLayer * OGRSQLiteExecuteSQL( OGRDataS
          }
      }
  
@@ -436,7 +436,7 @@ Last-Update: 2013-10-11
  			<td class="xml">    <AdviseRead><span class="value">true</span></AdviseRead></td>
 --- a/gcore/gdal_priv.h
 +++ b/gcore/gdal_priv.h
-@@ -932,7 +932,7 @@ int CPL_DLL GDALCheckDatasetDimensions(
+@@ -935,7 +935,7 @@ int CPL_DLL GDALCheckDatasetDimensions(
  int CPL_DLL GDALCheckBandCount( int nBands, int bIsZeroAllowed );
  
  
@@ -447,7 +447,7 @@ Last-Update: 2013-10-11
   (dfVal1 == dfVal2 || fabs(dfVal1 - dfVal2) < 1e-10 || (dfVal2 != 0 && fabs(1 - dfVal1 / dfVal2) < 1e-10 ))
 --- a/gcore/gdaldataset.cpp
 +++ b/gcore/gdaldataset.cpp
-@@ -1874,7 +1874,7 @@ void CPL_STDCALL GDALGetOpenDatasets( GD
+@@ -1870,7 +1870,7 @@ void CPL_STDCALL GDALGetOpenDatasets( GD
  /*                        GDALCleanOpenDatasetsList()                   */
  /************************************************************************/
  
@@ -502,7 +502,7 @@ Last-Update: 2013-10-11
  
 --- a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdblayer.cpp
 +++ b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdblayer.cpp
-@@ -789,7 +789,7 @@ FileGDBIterator* OGROpenFileGDBLayer::Bu
+@@ -818,7 +818,7 @@ FileGDBIterator* OGROpenFileGDBLayer::Bu
          poNode->nOperation == SWQ_AND && poNode->nSubExprCount == 2 )
      {
          /* Even if there's only one branch of the 2 that results to an iterator, */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git

