[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=43dfdde

The following commit has been merged in the master branch:
commit 43dfdde9f054c57e8c0e263f760eecc3e3dcabc4
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Sep 19 14:40:32 2015 +0000

    #1111: Minor updates.
---
 website/Makefile | 9 +++++----
 website/README   | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/website/Makefile b/website/Makefile
index 7f65722..e7e9d6a 100644
--- a/website/Makefile
+++ b/website/Makefile
@@ -151,10 +151,11 @@ update-manpage:
 	| sed -e's/ <<A HREF="mailto.*>//' -e'$$d' | sed -e's/<TABLE>/<TABLE class="table table-striped">/' -e's,<TR VALIGN=top><TD><HR></TD><TD><HR></TD><TD><HR></TD><TD><HR></TD><TD><HR></TD></TR>,,' -e's/<TR VALIGN=top>/<TR>/' -e's,<TR><TD>\([A-Z0-9]*\)</TD>,<TR><TH>
</TH>,' -e's/<H2>/<H2 class="text-capitalize">/' > var/__manpage__
 
 update-intro:
-	@cp -f ../doc/templates/__intro__ doxygen/draft-intro.html
-	@sed -e 's,="makernote.html,="../makernote.html,' \
-	    doxygen/draft-intro.html > doxygen/intro.html
-	@rm -f doxygen/draft-intro.html
+# commented for now, until the doc/ intro is updated accordingly
+#	@cp -f ../doc/templates/__intro__ doxygen/draft-intro.html
+#	@sed -e 's,="makernote.html,="../makernote.html,' \
+#	    doxygen/draft-intro.html > doxygen/intro.html
+#	@rm -f doxygen/draft-intro.html
 
 update-sample:
 	@./bin/sample.sh
diff --git a/website/README b/website/README
index 0eb227d..c0af131 100644
--- a/website/README
+++ b/website/README
@@ -20,9 +20,9 @@ Subsequently, 'make clean; make' will remove and rebuild the web
 pages; 'make update' is only needed if something changed in the exiv2
 source or doc.
 
-To build the download page with correct links, dates and checksums (this
-is a step usually done only during the release process, but you can do it
-with the packages from exiv2.org to try):
+To build the pages with correct version info, download links, dates and
+checksums (this is a step usually done only during the release
+process, but you can do it with the packages from exiv2.org to try):
 
 - Copy the release tarball and windows package to website/html/
 - Run 'bin/release_info.sh <version>', <version> must correspond to the
@@ -33,7 +33,7 @@ Dependencies
 ------------
 
 - python
-- doxygen-1.5.4 must be available in the path with this name
+- doxygen
 - xsltproc
 - ps2pdf
 - man2html

-- 
exiv2 packaging