[gdal] 18/29: Update documentation for removal of separate ogr directory.

[Sebastiaan Couwenberg]

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

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

commit 75d96a2209b21d605f269294660ee8b4240730d0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jun 14 13:57:57 2015 +0200

    Update documentation for removal of separate ogr directory.
---
 debian/libgdal-doc.doc-base |  1 -
 debian/libgdal-doc.install  |  1 -
 debian/libgdal-doc.links    |  1 -
 debian/patches/doc          | 21 ++++++---------------
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/debian/libgdal-doc.doc-base b/debian/libgdal-doc.doc-base
index 63db6fe..2947416 100644
--- a/debian/libgdal-doc.doc-base
+++ b/debian/libgdal-doc.doc-base
@@ -6,4 +6,3 @@ Section: Science/Geoscience
 Format: HTML
 Index: /usr/share/doc/libgdal-doc/gdal/index.html
 Files: /usr/share/doc/libgdal-doc/gdal/*.html
- /usr/share/doc/libgdal-doc/ogr/*.html
diff --git a/debian/libgdal-doc.install b/debian/libgdal-doc.install
index d56c1c8..c25408c 100644
--- a/debian/libgdal-doc.install
+++ b/debian/libgdal-doc.install
@@ -1,2 +1 @@
 usr/share/doc/libgdal-doc/gdal
-usr/share/doc/libgdal-doc/ogr
diff --git a/debian/libgdal-doc.links b/debian/libgdal-doc.links
index 56612f8..ff9df2e 100644
--- a/debian/libgdal-doc.links
+++ b/debian/libgdal-doc.links
@@ -1,2 +1 @@
 usr/share/javascript/jquery/jquery.js usr/share/doc/libgdal-doc/gdal/jquery.js
-usr/share/javascript/jquery/jquery.js usr/share/doc/libgdal-doc/ogr/jquery.js
diff --git a/debian/patches/doc b/debian/patches/doc
index 88b47b3..434425f 100644
--- a/debian/patches/doc
+++ b/debian/patches/doc
@@ -8,7 +8,7 @@ Last-Update: 2013-10-13
  and Mapinfo mid/mif and TAB formats.<p>
  
 -OGR is a part of the <a href="http://www.gdal.org/">GDAL</a> library.<p>
-+OGR is a part of the <a href="../gdal/index.html">GDAL</a> library.<p>
++OGR is a part of the <a href="index.html">GDAL</a> library.<p>
  
  <h2>Resources</h2>
  
@@ -17,19 +17,10 @@ Last-Update: 2013-10-13
  <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="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) можн�
@@ -37,7 +28,7 @@ Last-Update: 2013-10-13
  
  Связанная с GDAL библиотека
 -<a href="ogr">OGR</a> (исходные тексты которой поставляются вместе с GDAL)
-+<a href="../ogr/index.html">OGR</a> (исходные тексты которой поставляются вместе с GDAL)
++<a href="index.html">OGR</a> (исходные тексты которой поставляются вместе с GDAL)
  предоставляет сходные возможности для работы с векторными данными. На странице
  <a href="NEWS.html">обновлений</a> вы сможете найти описание версии 1.3.1,
  выпущенной в октябре 2005 г.<p>
@@ -46,7 +37,7 @@ Last-Update: 2013-10-13
  <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="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>
@@ -57,7 +48,7 @@ Last-Update: 2013-10-13
  lançamento em Abril de 2013 da release 1.10.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
++A bilioteca <a href="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>
@@ -66,7 +57,7 @@ Last-Update: 2013-10-13
  <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="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>

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