[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=d9f1c05

The following commit has been merged in the master branch:
commit d9f1c0541220e3c1211b6d684b3114b44438bc19
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Jun 20 09:44:39 2015 +0000

    Fixed another broken link and reinstated the menu sidebar in the API doc.
---
 website/doxygen/Doxyfile   | 4 ++--
 website/doxygen/intro.html | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/website/doxygen/Doxyfile b/website/doxygen/Doxyfile
index 3cd09fa..5253c5e 100644
--- a/website/doxygen/Doxyfile
+++ b/website/doxygen/Doxyfile
@@ -710,13 +710,13 @@ HTML_FILE_EXTENSION    = .html
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard header.
 
-# HTML_HEADER            = html/exiv2-header.html
+HTML_HEADER            = html/exiv2-header.html
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard footer.
 
-# HTML_FOOTER            = html/exiv2-footer.html
+HTML_FOOTER            = html/exiv2-footer.html
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
 # style sheet that is used by each HTML page. It can be used to
diff --git a/website/doxygen/intro.html b/website/doxygen/intro.html
index 7466d1a..12dd323 100644
--- a/website/doxygen/intro.html
+++ b/website/doxygen/intro.html
@@ -104,6 +104,7 @@ different actions of the Exiv2 utility (actions.cpp).</p>
 <p>Exif Makernote data can be accessed through ExifData in the same
 way as the standard Exif tags. In other words, for each entry of a
 known Makernote, there is a corresponding Metadatum in the ExifData
-container. Makernote taglists are available in classes
-Exiv2::<Make>MakerNote (e.g.,
-<a class="el" href="classExiv2_1_1CanonMakerNote.html">Exiv2::CanonMakerNote</a>.)
+container. Makernote taglists are internally kept in classes
+Exiv2::Internal::<Make>MakerNote (e.g.,
+<a class="el" href="classExiv2_1_1Internal_1_1CanonMakerNote.html">
+Exiv2::Internal::CanonMakerNote</a>.)

-- 
exiv2 packaging