Description: Fix hyperlinks from the C++ library documentation to python-vigra documentation and the other way round.
Bug-Debian: http://bugs.debian.org/590069
Bug-Debian: http://bugs.debian.org/590068
Forwarded: not-needed
Reviewed-by: Daniel Stender <debian@danielstender.com>
Last-Update: 2016-01-24

--- a/docsrc/credits_changelog.dxx
+++ b/docsrc/credits_changelog.dxx
@@ -43,7 +43,7 @@
            also contributed his pLSA (probabilistic latent semantic analysis) implementation.
 
       <li> Nathan Huesken and Christoph Sommer helped a lot in developing
-           <a href="../vigranumpy/index.html">vigranumpy</a>, the VIGRA Python bindings.
+           <a href="/usr/share/doc/python-vigra-doc/html/index.html">vigranumpy</a>, the VIGRA Python bindings.
 
       <li> Jens-Malte Gottfried contributed to the cmake-based build system.
 
@@ -146,7 +146,7 @@ Many thanks to all!
 <b> Changes from Version 1.8.0 to 1.9.0</b>
 
 <ul>
-      <li> Flexible incremental computation of image and region statistics via \ref FeatureAccumulators and corresponding Python bindings (see <a href="../vigranumpy/index.html#vigra.analysis.extractFeatures">vigra.analysis.extractFeatures()</a> and <a href="../vigranumpy/index.html#vigra.analysis.extractRegionFeatures">vigra.analysis.extractRegionFeatures()</a>).
+      <li> Flexible incremental computation of image and region statistics via \ref FeatureAccumulators and corresponding Python bindings (see <a href="/usr/share/doc/python-vigra-doc/html/index.html#vigra.analysis.extractFeatures">vigra.analysis.extractFeatures()</a> and <a href="/usr/share/doc/python-vigra-doc/html/index.html#vigra.analysis.extractRegionFeatures">vigra.analysis.extractRegionFeatures()</a>).
 
       <li> Simultaneous iteration over several arrays via \ref vigra::CoupledScanOrderIterator.
 
@@ -158,7 +158,7 @@ Many thanks to all!
 
       <li> Extended \ref vigra::SplineImageView to handle \ref vigra::TinyVector pixels.
 
-      <li> Various convenience functions for vigranumpy's <a href="../vigranumpy/index.html#vigra.VigraArray">VigraArray</a>.
+      <li> Various convenience functions for vigranumpy's <a href="/usr/share/doc/python-vigra-doc/html/index.html#vigra.VigraArray">VigraArray</a>.
 
       <li> Minor improvements and bug fixes in the code and documentation.
  </ul>
@@ -203,7 +203,7 @@ Many thanks to all!
       <li> Added support for the <a href="http://www.openexr.com/">OpenEXR image format</a> and multi-page TIFF. Improved
            support for the SIF format.
 
-      <li> <b>vigranumpy</b>: added <a href="../vigranumpy/index.html#axistags-and-the-vigraarray-data-structure">axistags </a>
+      <li> <b>vigranumpy</b>: added <a href="/usr/share/doc/python-vigra-doc/html/index.html#axistags-and-the-vigraarray-data-structure">axistags </a>
            and completly re-implemented VigraArray and the conversion between
            Python and C++ arrays in terms of axistags.
 
@@ -261,7 +261,7 @@ Many thanks to all!
 
       <li> Added \ref vigra::NumpyAnyArray and \ref vigra::NumpyArray, improved \ref vigra::MultiArrayView.
 
-      <li> Added <b><a href="../vigranumpy/index.html">vigranumpy</a></b> (VIGRA Python bindings).
+      <li> Added <b><a href="/usr/share/doc/python-vigra-doc/html/index.html">vigranumpy</a></b> (VIGRA Python bindings).
 
       <li> Added \ref VigraMatlab.
 
--- a/docsrc/index.dxx
+++ b/docsrc/index.dxx
@@ -40,7 +40,7 @@
         <BR>&nbsp;&nbsp;&nbsp;<em>Demonstration programs for VIGRA's usage </em>
     <LI> \ref VigraMatlab
         <BR>&nbsp;&nbsp;&nbsp;<em>VIGRA Matlab bindings</em>
-    <LI> <b><a href="../vigranumpy/index.html">vigranumpy</a></b>
+    <LI> <b><a href="/usr/share/doc/python-vigra-doc/html/index.html">vigranumpy</a></b>
         <BR>&nbsp;&nbsp;&nbsp;<em>VIGRA Python bindings</em>
     <LI> \ref CreditsChangelog
         <BR>&nbsp;&nbsp;&nbsp;<em>Who contributed what?</em>
--- a/vigranumpy/docsrc/conf.py.in
+++ b/vigranumpy/docsrc/conf.py.in
@@ -240,7 +240,7 @@ for l in replace_file:
     .. |%s| replace:: %s
 """% (replacement[0],replacement[0][k+1:])
     rst_epilog += """
-    .. _%s: ../../doc/vigra/%s
+    .. _%s: /usr/share/doc/libvigraimpex-doc/html/%s
 """% (replacement[0],replacement[1])
 
 # make python accumulators documentation better (?)
--- a/vigranumpy/docsrc/index.rst
+++ b/vigranumpy/docsrc/index.rst
@@ -15,7 +15,7 @@ Vigranumpy Reference
 Introduction
 ------------
 
-Vigranumpy exports the functionality of the C++ image processing library `VIGRA <../vigra/index.html>`_ to Python. It can be invoked by importing the vigra module::
+Vigranumpy exports the functionality of the C++ image processing library `VIGRA <usr/share/doc/libvigraimpex-doc/html/index.html>`_ to Python. It can be invoked by importing the vigra module::
 
     import vigra
 
@@ -442,7 +442,7 @@ Color and Intensity Manipulation
 
 The module vigra.colors provides functions to adjust image brightness and contrast,
 and to transform between different color spaces.
-See `Color Conversions <../vigra/group__ColorConversions.html>`_ in the C++ documentation
+See `Color Conversions <usr/share/doc/libvigraimpex-doc/html/group__ColorConversions.html>`_ in the C++ documentation
 for more information.
 
 .. automodule:: vigra.colors