[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=03e23fc

The following commit has been merged in the master branch:
commit 03e23fcaa575b70a770cbe13415fe8483886d207
Author: asp <alan.pater at gmail.com>
Date:   Fri Apr 3 16:03:11 2015 +0000

    #1040 doc template for mwg-kw schema
---
 doc/templates/Makefile                                       |  3 ++-
 doc/templates/__index2__                                     |  1 +
 .../{tags-xmp-mwg-rs.html.in => tags-xmp-mwg-kw.html.in}     | 12 ++++++------
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/doc/templates/Makefile b/doc/templates/Makefile
index 07ea9d6..c10f886 100644
--- a/doc/templates/Makefile
+++ b/doc/templates/Makefile
@@ -137,7 +137,8 @@ SCHEMA = xmp_dc \
          xmp_MP \
          xmp_MPRI \
          xmp_MPReg \
-         xmp_mwg-rs
+         xmp_mwg-rs \
+         xmp_mwg-kw
 
 TAGLIST = ../../bin/taglist
 
diff --git a/doc/templates/__index2__ b/doc/templates/__index2__
index 923bcc8..19b712c 100644
--- a/doc/templates/__index2__
+++ b/doc/templates/__index2__
@@ -49,6 +49,7 @@
     <li><a href="tags-xmp-MPRI.html"><span>MPRI</span></a></li>
     <li><a href="tags-xmp-MPReg.html"><span>MPReg</span></a></li>
     <li><a href="tags-xmp-mwg-rs.html"><span>mwg-rs</span></a></li>
+    <li><a href="tags-xmp-mwg-kw.html"><span>mwg-kw</span></a></li>
   </ul>
 </div>
 
diff --git a/doc/templates/tags-xmp-mwg-rs.html.in b/doc/templates/tags-xmp-mwg-kw.html.in
similarity index 53%
copy from doc/templates/tags-xmp-mwg-rs.html.in
copy to doc/templates/tags-xmp-mwg-kw.html.in
index bf85e68..5ca5098 100644
--- a/doc/templates/tags-xmp-mwg-rs.html.in
+++ b/doc/templates/tags-xmp-mwg-kw.html.in
@@ -7,18 +7,18 @@ __header2__
 __index1__
 __index2__
 
-<h2>Metadata Working Group Regions schema</h2>
-<p>The Metadata Working Group's schema for image region metadata.
+<h2>Metadata Working Group Keywords schema</h2>
+<p>The Metadata Working Group's schema for hierarchical keywords metadata.
  <ul>
-  <li>Exiv2 keys are <b><code>Xmp.mwg-rs.<Property></code></b></li>
-  <li>The schema namespace URI is <b><code>http://www.metadataworkinggroup.com/schemas/regions/</code></b></li>
-  <li>The preferred schema namespace prefix is <b><code>mwg-rs</code></b></li>
+  <li>Exiv2 keys are always nested in the form <b><code>Xmp.mwg-kw.Keywords/mwg-kw:Hierarchy/mwg-kw:<Property></code></b></li>
+  <li>The schema namespace URI is <b><code>http://www.metadataworkinggroup.com/schemas/keywords/</code></b></li>
+  <li>The preferred schema namespace prefix is <b><code>mwg-kw</code></b></li>
  </ul>
 Reference: <a href="http://www.metadataworkinggroup.org/pdf/mwg_guidance.pdf" title="Guidelines for Handling Image Metadata">Guidelines for Handling Image Metadata</a></p>
 
 <p>Click on a column header to sort the table.</p>
 
-__xmp_mwg-rs__
+__xmp_mwg-kw__
 
 </div>
 <!-- closes content -->

-- 
exiv2 packaging