Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=b745ab7
The following commit has been merged in the master branch:
commit b745ab7977dbbea87cf2654f5a8e5535a9fb6874
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Thu Nov 16 15:53:25 2006 +0000
Fixed doc target
---
doc/templates/Makefile | 5 +++--
doc/templates/__header2__ | 2 +-
src/datasets.cpp | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/doc/templates/Makefile b/doc/templates/Makefile
index 33db566..b8cb10b 100644
--- a/doc/templates/Makefile
+++ b/doc/templates/Makefile
@@ -39,7 +39,7 @@ tags: $(TABLES) Iptc
$(TABLES): $(TAGLIST)
@echo Generating $@ table...
- @$(TAGLIST) $@ | awk -f tags.awk > $@.xml
+ @$(TAGLIST) $@ | sed -e"s/</\</g" -e"s/>/\>/g" | awk -f tags.awk > $@.xml
@xsltproc tags.xsl $@.xml > $@.tmp
@sed "s/report1/$@/" $@.tmp > __$@__
@touch $@
@@ -47,7 +47,8 @@ $(TABLES): $(TAGLIST)
Iptc: $(TAGLIST)
@echo Generating $@ table...
- @$(TAGLIST) $@ | awk -f iptc.awk > $@.xml
+ @$(TAGLIST) $@ | sed -e"s/</\</g" -e"s/>/\>/g" -e"s/±/\±/g" \
+ | awk -f iptc.awk > $@.xml
@xsltproc iptc.xsl $@.xml > $@.tmp
@sed "s/report1/$@/g" $@.tmp > __$@__
@touch $@
diff --git a/doc/templates/__header2__ b/doc/templates/__header2__
index a1a9c70..fd13e08 100644
--- a/doc/templates/__header2__
+++ b/doc/templates/__header2__
@@ -3,7 +3,7 @@
<meta name="Author" content="Andreas Huggel">
<meta name="Description" content="Open source Exif and Iptc metadata library and tools with Exif MakerNote and read/write support">
<meta name="Keywords" content="exif, iptc, metadata, makernote, manipulation, manipulate, read and write, write, change, update, jpeg, jpg, ifd, image file directory, thumbnail, thumbnails, tag, tags, canon, fujifilm, sigma/foveon, nikon, open source, opensource, huggel, andreas, andreas huggel">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link type="text/css" rel="stylesheet" href="../include/default.css">
<link type="text/css" rel="stylesheet" href="../include/sortabletable.css">
<link type="text/css" rel="stylesheet" href="doxygen.css">
diff --git a/src/datasets.cpp b/src/datasets.cpp
index 25a1a2f..1e5eb9a 100644
--- a/src/datasets.cpp
+++ b/src/datasets.cpp
@@ -130,7 +130,7 @@ namespace Exiv2 {
"in ISO 8601 to indicate year, month and day the service sent the material.",
true, false, 8, 8, Exiv2::date, IptcDataSets::envelope, ""),
DataSet(IptcDataSets::TimeSent, "TimeSent", "TimeSent",
- "Uses the format HHMMSS±HHMM where HHMMSS refers to "
+ "Uses the format HHMMSS±HHMM where HHMMSS refers to "
"local hour, minute and seconds and HHMM refers to hours and "
"minutes ahead (+) or behind (-) Universal Coordinated Time as "
"described in ISO 8601. This is the time the service sent the material.",
--
exiv2 packaging