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

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit aa569386481289ebf19fc8a6d23700e220df7f21
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Oct 13 17:17:31 2013 +0200

    Reinstate doc patch, refresh and update to fix more links.

diff --git a/debian/changelog b/debian/changelog
index 255ac10..8277fda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
   * Add doc-base configuration for libgdal-doc.
   * Only install NEWS.Debian in libgdal-dev.
     (closes: #677693)
+  * Reinstate doc patch, refresh and update to fix more links.
+    (closes: #471198)
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/patches/doc b/debian/patches/doc
index 48627d6..0efa1b1 100644
--- a/debian/patches/doc
+++ b/debian/patches/doc
@@ -1,21 +1,26 @@
-Index: gdal/doc/index.dox
-===================================================================
---- gdal.orig/doc/index.dox	2013-06-20 10:03:58.000000000 +0200
-+++ gdal/doc/index.dox	2013-06-20 10:03:58.000000000 +0200
-@@ -19,7 +19,7 @@
+--- a/doc/index.dox
++++ b/doc/index.dox
+@@ -19,7 +19,7 @@ for data translation and processing.  Th
  <a href="http://trac.osgeo.org/gdal/wiki/Release/1.9.2-News">NEWS</a>
  page describes the October 2012 GDAL/OGR 1.9.2 release.
  
 -The related <a href="ogr/index.html">OGR</a> library (which lives within the GDAL source tree) 
-+The related <a href="../ogr/index.html">OGR</a> library (which lives within the GDAL source tree) 
++The related <a href="../ogr/index.html">OGR</a> library (which lives within the GDAL source tree)
  provides a similar capability for simple features vector data.
  
  Master: http://www.gdal.org<br>
-Index: gdal/ogr/index.dox
-===================================================================
---- gdal.orig/ogr/index.dox	2013-06-20 10:03:58.000000000 +0200
-+++ gdal/ogr/index.dox	2013-06-20 10:03:58.000000000 +0200
-@@ -6,7 +6,7 @@
+@@ -51,7 +51,7 @@ Download:
+ <li> <a href="gdal_tutorial.html">GDAL API Tutorial</a>
+ <li> <a href="gdal_drivertut.html">GDAL Driver Implementation Tutorial</a>
+ <li> <a href="warptut.html">GDAL Warp API Tutorial</a>
+-<li> <a href="ogr/osr_tutorial.html">OGRSpatialReference Tutorial</a>
++<li> <a href="../ogr/osr_tutorial.html">OGRSpatialReference Tutorial</a>
+ <li> <a href="gdal_8h.html">GDAL C API</a>
+ <li> <a href="gdal__alg_8h.html">GDAL Algorithms C API</a>
+ <li> <a href="classGDALDataset.html">GDALDataset C++ API</a>
+--- a/ogr/index.dox
++++ b/ogr/index.dox
+@@ -6,7 +6,7 @@ tools) providing read (and sometimes wri
  formats including ESRI Shapefiles, S-57, SDTS, PostGIS, Oracle Spatial, 
  and Mapinfo mid/mif and TAB formats.<p>
  
@@ -24,3 +29,61 @@ Index: gdal/ogr/index.dox
  
  <h2>Resources</h2>
  
+@@ -14,7 +14,7 @@ OGR is a part of the <a href="http://www
+ 
+ <li> <a href="ogr_formats.html">OGR Supported Formats</a> : ESRI Shapefile, ESRI ArcSDE, MapInfo (tab and mid/mif), GML, KML, PostGIS, Oracle Spatial, ...
+ 
+-<li> <a href="../ogr_utilities.html">OGR Utility Programs</a> : ogrinfo, ogr2ogr, ogrtindex
++<li> <a href="../gdal/ogr_utilities.html">OGR Utility Programs</a> : ogrinfo, ogr2ogr, ogrtindex
+ 
+ <li> <a href="hierarchy.html">OGR Class Documentation</a>
+ 
+@@ -51,7 +51,7 @@ or <a href="http://home.gdal.org/project
+ 
+ <h3>Ready to Use Executables</h3>
+ 
+-The best way to get OGR <a href="ogr_utilities.html">utilities</a>
++The best way to get OGR <a href="../gdal/ogr_utilities.html">utilities</a>
+ in ready-to-use form is to download the latest 
+ <a href="http://fwtools.maptools.org/">FWTools</a> kit
+ for your platform.  While large, these include builds of the OGR utilities
+--- a/doc/ru/index_ru.dox
++++ b/doc/ru/index_ru.dox
+@@ -26,7 +26,7 @@ GDAL/OGR 1.5.1 (март 2008) можнÐ
+ <a href="http://trac.osgeo.org/gdal/wiki/Release/1.5.1-News">новостей</a>.
+ 
+ Связанная с GDAL библиотека
+-<a href="ogr">OGR</a> (исходные тексты которой поставляются вместе с GDAL)
++<a href="../ogr/index.html">OGR</a> (исходные тексты которой поставляются вместе с GDAL)
+ предоставляет сходные возможности для работы с векторными данными. На странице
+ <a href="NEWS.html">обновлений</a> вы сможете найти описание версии 1.3.1,
+ выпущенной в октябре 2005 г.<p>
+@@ -67,7 +67,7 @@ GDAL/OGR 1.5.1 (март 2008) можнÐ
+ <li> <a href="gdal_tutorial_ru.html">Руководство по использованию GDAL</a>
+ <li> <a href="gdal_drivertut.html">Руководство по написанию драйверов GDAL</a>
+ <li> <a href="warptut.html">Руководство по использованию интерфейса трансформации</a>
+-<li> <a href="ogr/osr_tutorial.html">Руководство по OGRSpatialReference</a>
++<li> <a href="../ogr/osr_tutorial.html">Руководство по OGRSpatialReference</a>
+ <li> <a href="gdal_8h.html">gdal.h</a> - интерфейс GDAL для языка C.
+ <li> <a href="classGDALDataset.html">GDALDataset</a>
+ <li> <a href="classGDALRasterBand.html">GDALRasterBand</a>
+--- a/doc/br/index_br.dox
++++ b/doc/br/index_br.dox
+@@ -29,7 +29,7 @@ A página
+ <a href="http://trac.osgeo.org/gdal/wiki/Release/1.9.0-News">novidades</a> descreve o 
+ lançamento em Dezembro de 2011 da release 1.9.0 da biblioteca GDAL/OGR.
+ 
+-A bilioteca <a href="ogr">OGR</a> (cujo código fonte esta incluído na GDAL) possue
++A bilioteca <a href="../ogr/index.html">OGR</a> (cujo código fonte esta incluído na GDAL) possue
+ funcionalidades semelhantes às da GDAL para datos vetorias (Simple Features).
+ 
+ Página Principal: http://www.gdal.org<br>
+@@ -60,7 +60,7 @@ Download:
+ <li> <a href="gdal_tutorial_br.html">Tutorial da API do GDAL</a> <b>(em português)</b>
+ <li> <a href="gdal_drivertut.html">Tutorial de implementação de drivers</a>
+ <li> <a href="warptut.html">Tutorial de transformação geométrica</a>
+-<li> <a href="ogr/osr_tutorial.html">Tutorial de Referência Espacial</a>
++<li> <a href="../ogr/osr_tutorial.html">Tutorial de Referência Espacial</a>
+ <li> <a href="gdal_8h.html">GDAL API para C</a>
+ <li> <a href="classGDALDataset.html">GDALDataset</a>
+ <li> <a href="classGDALRasterBand.html">GDALRasterBand</a>
diff --git a/debian/patches/series b/debian/patches/series
index 340a3f6..b8945e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+doc
 ogdi
 rubymakefile
 man

-- 
GDAL/OGR library and tools