[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

Bas Couwenberg sebastic at xs4all.nl
Mon Oct 14 03:20:59 UTC 2013


The following commit has been merged in the master branch:
commit 16e6d1b51c8652026a600eb87c550dcfb6214cc0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Oct 14 00:13:33 2013 +0200

    Add patch headers.

diff --git a/debian/patches/accomodate-typo b/debian/patches/accomodate-typo
index bd48e26..6de5547 100644
--- a/debian/patches/accomodate-typo
+++ b/debian/patches/accomodate-typo
@@ -1,3 +1,6 @@
+Description: Fix 'accomodate' typo, replace with 'accommodate'.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2013-10-11
 --- a/NEWS
 +++ b/NEWS
 @@ -3106,7 +3106,7 @@ GeoTIFF driver :
diff --git a/debian/patches/algoritm-typo b/debian/patches/algoritm-typo
index 71e1462..8154f14 100644
--- a/debian/patches/algoritm-typo
+++ b/debian/patches/algoritm-typo
@@ -1,3 +1,6 @@
+Description: Fix 'algoritm' typo, replace with 'algorithm'.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2013-10-11
 --- a/swig/include/Operations.i
 +++ b/swig/include/Operations.i
 @@ -447,7 +447,7 @@ int wrapper_GridCreate( char* algorithmO
diff --git a/debian/patches/bandwith-typo b/debian/patches/bandwith-typo
index b51afaf..71db03a 100644
--- a/debian/patches/bandwith-typo
+++ b/debian/patches/bandwith-typo
@@ -1,3 +1,6 @@
+Description: Fix 'bandwith' typo, replace with 'bandwidth'.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2013-10-11
 --- a/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
 +++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
 @@ -444,7 +444,7 @@ int OGRSQLiteDataSource::OpenOrCreateDB(
diff --git a/debian/patches/consistant-typo b/debian/patches/consistant-typo
index 8376736..8705b51 100644
--- a/debian/patches/consistant-typo
+++ b/debian/patches/consistant-typo
@@ -1,3 +1,6 @@
+Description: Fix 'consistant' typo, replace with 'consistent'.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2013-10-11
 --- a/NEWS
 +++ b/NEWS
 @@ -1149,7 +1149,7 @@ Utilities:
diff --git a/debian/patches/developement-typo b/debian/patches/developement-typo
index 86b949d..d24af28 100644
--- a/debian/patches/developement-typo
+++ b/debian/patches/developement-typo
@@ -1,3 +1,6 @@
+Description: Fix 'developement' typo, replace with 'development'.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2013-10-11
 --- a/NEWS
 +++ b/NEWS
 @@ -224,7 +224,7 @@ Build(Unix):
diff --git a/debian/patches/doc b/debian/patches/doc
index 0efa1b1..f3743f6 100644
--- a/debian/patches/doc
+++ b/debian/patches/doc
@@ -1,3 +1,6 @@
+Description: Fix links to OGR documentation.
+Author: Francesco Paolo Lovergine <frankie at debian.org>, Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2013-10-13
 --- a/doc/index.dox
 +++ b/doc/index.dox
 @@ -19,7 +19,7 @@ for data translation and processing.  Th
diff --git a/debian/patches/doc-brief b/debian/patches/doc-brief
index c07933c..788de72 100644
--- a/debian/patches/doc-brief
+++ b/debian/patches/doc-brief
@@ -1,3 +1,7 @@
+Description: Add a brief summary to the GDAL and OGR utilities pages.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=421653
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2013-10-13
 --- a/apps/gdal_utilities.dox
 +++ b/apps/gdal_utilities.dox
 @@ -4,6 +4,7 @@
diff --git a/debian/patches/ecw-plugin b/debian/patches/ecw-plugin
index 5ab3757..aaf4a2a 100644
--- a/debian/patches/ecw-plugin
+++ b/debian/patches/ecw-plugin
@@ -1,3 +1,6 @@
+Description: Add support for building the libgdal-ecw plugin.
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Last-Update: 2013-10-04
 --- a/frmts/ecw/GNUmakefile
 +++ b/frmts/ecw/GNUmakefile
 @@ -21,3 +21,12 @@ plugin: $(PLUGIN_SO)
diff --git a/debian/patches/explicitely-typo b/debian/patches/explicitely-typo
index ff94f92..93aeb93 100644
--- a/debian/patches/explicitely-typo
+++ b/debian/patches/explicitely-typo
@@ -1,3 +1,6 @@
+Description: Fix 'explicitely' typo, replace with 'explicitly'.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2013-10-11
 --- a/NEWS
 +++ b/NEWS
 @@ -752,7 +752,7 @@ GML driver:
diff --git a/debian/patches/gdal-grass b/debian/patches/gdal-grass
index 5730379..55885a6 100644
--- a/debian/patches/gdal-grass
+++ b/debian/patches/gdal-grass
@@ -1,3 +1,7 @@
+Description: Add support for building the libgdal-grass plugin.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=544978
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Last-Update: 2009-09-08
 --- a/frmts/grass/GNUmakefile
 +++ b/frmts/grass/GNUmakefile
 @@ -21,11 +21,13 @@ clean:
diff --git a/debian/patches/gdalpaths b/debian/patches/gdalpaths
index ba29df1..e5c8ebf 100644
--- a/debian/patches/gdalpaths
+++ b/debian/patches/gdalpaths
@@ -1,3 +1,6 @@
+Description: Install GDAL plugins in version specific subdirectory.
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Last-Update: 2013-07-01
 --- a/gcore/gdaldrivermanager.cpp
 +++ b/gcore/gdaldrivermanager.cpp
 @@ -667,7 +667,7 @@ void GDALDriverManager::AutoLoadDrivers(
diff --git a/debian/patches/hardening b/debian/patches/hardening
index 6e1716a..c47b014 100644
--- a/debian/patches/hardening
+++ b/debian/patches/hardening
@@ -1,3 +1,6 @@
+Description: Add support for all hardening buildflags.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2013-10-13
 --- a/swig/perl/Makefile.PL
 +++ b/swig/perl/Makefile.PL
 @@ -1,4 +1,5 @@
diff --git a/debian/patches/hdf4 b/debian/patches/hdf4
index d1dbe26..b5f4ee1 100644
--- a/debian/patches/hdf4
+++ b/debian/patches/hdf4
@@ -1,3 +1,6 @@
+Description: Link the -alt HDF4 libs.
+Author: Francesco Paolo Lovergine <frankie at debian.org>, Alan Boudreault <aboudreault at mapgears.com>	
+Last-Update: 2012-02-01
 --- a/configure
 +++ b/configure
 @@ -20930,7 +20930,7 @@ fi
diff --git a/debian/patches/inconsistant-typo b/debian/patches/inconsistant-typo
index 2358fc6..8354601 100644
--- a/debian/patches/inconsistant-typo
+++ b/debian/patches/inconsistant-typo
@@ -1,3 +1,6 @@
+Description: Fix 'inconsistant' typo, replace with 'inconsistent'.
+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[] = {
diff --git a/debian/patches/initalize-typo b/debian/patches/initalize-typo
index f2dfc2f..f518b45 100644
--- a/debian/patches/initalize-typo
+++ b/debian/patches/initalize-typo
@@ -1,3 +1,6 @@
+Description: Fix 'initialized' typo, replace with 'initialized'.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2013-10-11
 --- a/apps/gdal_utilities.dox
 +++ b/apps/gdal_utilities.dox
 @@ -1359,7 +1359,7 @@ Create an image with the pixels in all b
diff --git a/debian/patches/java-make b/debian/patches/java-make
index dee4d51..b5abef2 100644
--- a/debian/patches/java-make
+++ b/debian/patches/java-make
@@ -1,3 +1,7 @@
+Description: Force removal of object files.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628022
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Last-Update: 2013-07-01
 --- a/swig/java/GNUmakefile
 +++ b/swig/java/GNUmakefile
 @@ -35,7 +35,7 @@ JAVA_OBJECTS = gdalconst_wrap.$(OBJ_EXT)
diff --git a/debian/patches/java.opt b/debian/patches/java.opt
index e898d69..e5806d8 100644
--- a/debian/patches/java.opt
+++ b/debian/patches/java.opt
@@ -1,3 +1,7 @@
+Description: Fix path to default JVM.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628022
+Author: Ezequiel Lara Gómez <ezequiel.lara at yahoo.es>
+Last-Update: 2013-07-01
 --- a/swig/java/java.opt
 +++ b/swig/java/java.opt
 @@ -1,7 +1,7 @@
diff --git a/debian/patches/man b/debian/patches/man
index 5b49e78..b65461a 100644
--- a/debian/patches/man
+++ b/debian/patches/man
@@ -1,3 +1,6 @@
+Description: Man pages are not generated by upstream makefile, add .PHONY entry.
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Last-Update: 2008-01-08
 --- a/GNUmakefile
 +++ b/GNUmakefile
 @@ -235,3 +235,4 @@ endif # HAVE_LD_SHARED=no
diff --git a/debian/patches/mrsid-plugin b/debian/patches/mrsid-plugin
index 90ce54d..f9a1947 100644
--- a/debian/patches/mrsid-plugin
+++ b/debian/patches/mrsid-plugin
@@ -1,3 +1,6 @@
+Description: Add support for building the libgdal-mrsid plugin.
+Author: Alan Boudreault <aboudreault at mapgears.com>, Francesco Paolo Lovergine <frankie at debian.org>
+Last-Update: 2010-05-14
 --- a/frmts/mrsid/GNUmakefile
 +++ b/frmts/mrsid/GNUmakefile
 @@ -31,3 +31,10 @@ $(PLUGIN_DLL):  $(OBJ)
diff --git a/debian/patches/ogdi b/debian/patches/ogdi
index 812d4ae..4da034d 100644
--- a/debian/patches/ogdi
+++ b/debian/patches/ogdi
@@ -1,3 +1,6 @@
+Description: Fix include path of ogdi library.
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Last-Update: 2010-05-13
 --- a/GDALmake.opt.in
 +++ b/GDALmake.opt.in
 @@ -353,7 +353,7 @@ endif
diff --git a/debian/patches/paramters-typo b/debian/patches/paramters-typo
index 375107b..d87ff0d 100644
--- a/debian/patches/paramters-typo
+++ b/debian/patches/paramters-typo
@@ -1,3 +1,6 @@
+Description: Fix 'paramters' typo, replace with 'parameters'.
+Author: Bas Couwenger <sebastic at xs4all.nl>
+Last-Update: 2013-10-11
 --- a/frmts/georaster/georaster_wrapper.cpp
 +++ b/frmts/georaster/georaster_wrapper.cpp
 @@ -705,7 +705,7 @@ bool GeoRasterWrapper::Create( char* psz
diff --git a/debian/patches/ressource-typo b/debian/patches/ressource-typo
index a377cfb..92547f3 100644
--- a/debian/patches/ressource-typo
+++ b/debian/patches/ressource-typo
@@ -1,3 +1,6 @@
+Description: Fix 'ressources' typo, replace with 'resources'.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2013-10-11
 --- a/NEWS
 +++ b/NEWS
 @@ -1498,7 +1498,7 @@ USGSDEM driver:
diff --git a/debian/patches/spatialite b/debian/patches/spatialite
index b0f4bb7..cd664f5 100644
--- a/debian/patches/spatialite
+++ b/debian/patches/spatialite
@@ -1,3 +1,6 @@
+Description: Fix linking with sqlite3, because Debian spatialite does not embed Sqlite.
+Author: Francesco Paolo Lovergine <frankie at debian.org>	
+Last-Update: 2011-05-12
 --- a/configure
 +++ b/configure
 @@ -24910,7 +24910,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
diff --git a/debian/patches/symver b/debian/patches/symver
index bfa2139..ae74f49 100644
--- a/debian/patches/symver
+++ b/debian/patches/symver
@@ -1,3 +1,6 @@
+Description: Use Debian specific symbol versioning.
+Author: Francesco Paolo Lovergine <frankie at debian.org>	
+Last-Update: 2011-09-27
 --- a/GNUmakefile
 +++ b/GNUmakefile
 @@ -39,9 +39,10 @@ $(GDAL_SLIB):	$(GDAL_OBJ) $(GDAL_LIB)
diff --git a/debian/patches/transfered-typo b/debian/patches/transfered-typo
index dba3ff6..10a5fab 100644
--- a/debian/patches/transfered-typo
+++ b/debian/patches/transfered-typo
@@ -1,3 +1,6 @@
+Description: Fix 'transfered' typo, replace with 'transferred'.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2013-10-11
 --- a/ogr/ogrsf_frmts/generic/ogrunionlayer.h
 +++ b/ogr/ogrsf_frmts/generic/ogrunionlayer.h
 @@ -94,7 +94,7 @@ class OGRUnionLayer : public OGRLayer
diff --git a/debian/patches/transfering-typo b/debian/patches/transfering-typo
index 481d227..36083cb 100644
--- a/debian/patches/transfering-typo
+++ b/debian/patches/transfering-typo
@@ -1,3 +1,6 @@
+Description: Fix 'transfering' typo, replace with 'transferring'.
+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
diff --git a/debian/patches/unkown-typo b/debian/patches/unkown-typo
index 15e2f7e..bf4800c 100644
--- a/debian/patches/unkown-typo
+++ b/debian/patches/unkown-typo
@@ -1,3 +1,6 @@
+Description: Fix 'unkown' typo, replace with 'unknown'.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2013-10-11
 --- a/apps/gdal_grid.cpp
 +++ b/apps/gdal_grid.cpp
 @@ -803,7 +803,7 @@ int main( int argc, char ** argv )
diff --git a/debian/patches/usefull-typo b/debian/patches/usefull-typo
index 01bbbd0..77aac29 100644
--- a/debian/patches/usefull-typo
+++ b/debian/patches/usefull-typo
@@ -1,3 +1,6 @@
+Description: Fix 'usefull' typo, replace with 'useful'.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2013-10-11
 --- a/NEWS
 +++ b/NEWS
 @@ -2002,7 +2002,7 @@ Port:

-- 
GDAL/OGR library and tools



More information about the Pkg-grass-devel mailing list