[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=23de41d

The following commit has been merged in the master branch:
commit 23de41d33368e7e037f66f2a4674f6ccaf06bbe1
Author: asp <alan.pater at gmail.com>
Date:   Mon Apr 27 05:27:23 2015 +0000

    website template, Media Pro name change
---
 doc/templates/tags-xmp-MP.html.in       | 1 +
 doc/templates/tags-xmp-mediapro.html.in | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/templates/tags-xmp-MP.html.in b/doc/templates/tags-xmp-MP.html.in
index b6ee84a..76d45df 100644
--- a/doc/templates/tags-xmp-MP.html.in
+++ b/doc/templates/tags-xmp-MP.html.in
@@ -16,6 +16,7 @@ __index2__
   <li>The MP schema namespace URI is <b><code>http://ns.microsoft.com/photo/1.2/</code></b></li>
   <li>This schema namespace prefix is <b><code>MP</code></b></li>
  </ul>
+ <ul>
   <li>The MPRI schema namespace URI is <b><code>http://ns.microsoft.com/photo/1.2/t/RegionInfo#</code></b></li>
   <li>This schema namespace prefix is <b><code>MPRI</code></b></li>
  </ul>
diff --git a/doc/templates/tags-xmp-mediapro.html.in b/doc/templates/tags-xmp-mediapro.html.in
index f1b60ab..a035f07 100644
--- a/doc/templates/tags-xmp-mediapro.html.in
+++ b/doc/templates/tags-xmp-mediapro.html.in
@@ -7,9 +7,8 @@ __header2__
 __index1__
 __index2__
 
-<h2>iView Media Pro schema</h2>
-<p>iView Media Pro schema tags. See also its successor, the
-   <a href="tags-xmp-expressionmedia.html" title="Microsoft Expression Media schema">Microsoft Expression Media schema</a>.
+<h2>Photo One Media Pro schema</h2>
+<p>Photo One Media Pro XMP properties. Program was previously known as Microsoft Expression Media and iView Media Pro.
  <ul>
   <li>Exiv2 keys are <b><code>Xmp.mediapro.<Property></code></b></li>
   <li>The schema namespace URI is <b><code>http://ns.iview-multimedia.com/mediapro/1.0/</code></b></li>
@@ -21,6 +20,10 @@ Reference: ?</p>
 
 __xmp_mediapro__
 
+<p>While owned by Microsoft the <a href="tags-xmp-expressionmedia.html" title="Microsoft Expression Media schema">Microsoft Expression Media schema</a> was used.</p>
+
+__xmp_expressionmedia__
+
 </div>
 <!-- closes content -->
 

-- 
exiv2 packaging