[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=e6408f1

The following commit has been merged in the master branch:
commit e6408f101bde38ec5e6c382eb18086fcdfe485f5
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat May 29 09:09:03 2010 +0000

    Added HTML doc for new XMP schemas mediapro, expressionmedia and kipi.
---
 doc/ChangeLog            | 2 +-
 doc/templates/Makefile   | 5 ++++-
 doc/templates/__index2__ | 3 +++
 src/doxygen.hpp.in       | 3 +++
 src/properties.cpp       | 2 +-
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index f861519..e7f969d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -58,7 +58,7 @@ Changes from version 0.19 to 0.20
 	         - Added Kipi XMP namespace used by digiKam kipi-plugins
 	           (Gilles Caulier)
 	         - Added iView Media Pro and MS Expression Media XMP schemas.
-	           (Steve Wright)
+	           (Silversleeves)
 	         - Generalized class Error, added class WError for use with
 	           Unicode-Paths.
 	         - Updated Nikon Lens lookup table to v4.3.401.01 of
diff --git a/doc/templates/Makefile b/doc/templates/Makefile
index 78182d8..2a86dd4 100644
--- a/doc/templates/Makefile
+++ b/doc/templates/Makefile
@@ -123,8 +123,11 @@ SCHEMA = xmp_dc \
          xmp_iptc \
          xmp_MicrosoftPhoto \
          xmp_digiKam \
+         xmp_kipi \
          xmp_iptcExt \
-         xmp_plus
+         xmp_plus \
+         xmp_mediapro \
+         xmp_expressionmedia
 
 TAGLIST = ../../src/taglist
 
diff --git a/doc/templates/__index2__ b/doc/templates/__index2__
index 974d6a2..2d9e6a3 100644
--- a/doc/templates/__index2__
+++ b/doc/templates/__index2__
@@ -38,7 +38,10 @@
     <li><a href="tags-xmp-iptcExt.html"><span>Iptc4xmpExt</span></a></li>
     <li><a href="tags-xmp-plus.html"><span>plus</span></a></li>
     <li><a href="tags-xmp-digiKam.html"><span>digiKam</span></a></li>
+    <li><a href="tags-xmp-kipi.html"><span>kipi</span></a></li>
     <li><a href="tags-xmp-MicrosoftPhoto.html"><span>MicrosoftPhoto</span></a></li>
+    <li><a href="tags-xmp-mediapro.html"><span>mediapro</span></a></li>
+    <li><a href="tags-xmp-expressionmedia.html"><span>expressionmedia</span></a></li>
   </ul>
 </div>
 
diff --git a/src/doxygen.hpp.in b/src/doxygen.hpp.in
index c4c7689..94ce8ed 100644
--- a/src/doxygen.hpp.in
+++ b/src/doxygen.hpp.in
@@ -73,7 +73,10 @@
   - <a href="tags-xmp-iptcExt.html">Iptc4xmpExt schema</a>
   - <a href="tags-xmp-plus.html">PLUS schema</a>
   - <a href="tags-xmp-digiKam.html">digiKam schema</a>
+  - <a href="tags-xmp-kipi.html">KDE Image Program Interface schema</a>
   - <a href="tags-xmp-MicrosoftPhoto.html">MicrosoftPhoto schema</a>
+  - <a href="tags-xmp-mediapro.html">iView Media Pro schema</a>
+  - <a href="tags-xmp-expressionmedia.html">Microsoft Expression Media schema</a>
 
   @section formats File Formats
 
diff --git a/src/properties.cpp b/src/properties.cpp
index 966416d..212a704 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -94,7 +94,7 @@ namespace Exiv2 {
         // Schemas   -   NOTE: Schemas which the XMP-SDK doesn't know must be registered in XmpParser::initialize - Todo: Automate this
         { "http://purl.org/dc/elements/1.1/",             "dc",             xmpDcInfo,        N_("Dublin Core schema")                        },
         { "http://www.digikam.org/ns/1.0/",               "digiKam",        xmpDigikamInfo,   N_("digiKam Photo Management schema")           },
-        { "http://www.digikam.org/ns/kipi/1.0/",          "kipi",           xmpKipiInfo,      N_("KDE Image Program Interface schema")           },
+        { "http://www.digikam.org/ns/kipi/1.0/",          "kipi",           xmpKipiInfo,      N_("KDE Image Program Interface schema")        },
         { "http://ns.adobe.com/xap/1.0/",                 "xmp",            xmpXmpInfo,       N_("XMP Basic schema")                          },
         { "http://ns.adobe.com/xap/1.0/rights/",          "xmpRights",      xmpXmpRightsInfo, N_("XMP Rights Management schema")              },
         { "http://ns.adobe.com/xap/1.0/mm/",              "xmpMM",          xmpXmpMMInfo,     N_("XMP Media Management schema")               },

-- 
exiv2 packaging