[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=6646ee2

The following commit has been merged in the master branch:
commit 6646ee2ab9ea2d7d3c522c51bb00cd194acff835
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Jun 18 11:27:10 2015 +0000

    First few website updates for 0.25, just to make things work again.
---
 website/bin/conversion.sh         | 0
 website/doxygen/Doxyfile          | 2 +-
 website/master/conversion.html.in | 2 +-
 website/var/__footer__            | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/website/bin/conversion.sh b/website/bin/conversion.sh
old mode 100644
new mode 100755
diff --git a/website/doxygen/Doxyfile b/website/doxygen/Doxyfile
index ff60a56..3cd09fa 100644
--- a/website/doxygen/Doxyfile
+++ b/website/doxygen/Doxyfile
@@ -493,7 +493,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = ../src doxygen/mainpage.hpp
+INPUT                  = ../src ../include/exiv2 doxygen/mainpage.hpp
 
 # This tag can be used to specify the character encoding of the source files that
 # doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default
diff --git a/website/master/conversion.html.in b/website/master/conversion.html.in
index cf75e88..f87e2c0 100644
--- a/website/master/conversion.html.in
+++ b/website/master/conversion.html.in
@@ -10,7 +10,7 @@ __maintitle__
 <div>
 <p>Exiv2 maps and will convert Exif tags and IPTC Datasets to and from XMP properties.<br>
 This function is available via the import/export command line options: <a title="exiv2 manpage" href="manpage.html">exiv2 -eX image.jpg; exiv2 -iX image.jpg</a><br>
-and via the exiv2 API: <a title="convert.hpp File Reference" href="convert_8hpp.html">convert.hpp File Reference</a></p>
+and via the exiv2 API: <a title="convert.hpp File Reference" href="doc/convert_8hpp.html">convert.hpp File Reference</a></p>
 </div>
 
 __conversion__
diff --git a/website/var/__footer__ b/website/var/__footer__
index f6a8045..2aa6a3f 100644
--- a/website/var/__footer__
+++ b/website/var/__footer__
@@ -1,7 +1,7 @@
 <div id="footer">
 <table border="0" cellspacing="0" cellpadding="0" width="100%">
  <tr>
-  <td align="left" valign="top">Copyright © 2004 - 2014 Andreas Huggel</td>
+  <td align="left" valign="top">Copyright © 2004 - 2015 Andreas Huggel</td>
   <td align="left" valign="middle">
     <script type="text/javascript">
     <!-- 

-- 
exiv2 packaging