[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=8a7604f

The following commit has been merged in the master branch:
commit 8a7604fb58d3d1247159278772653a94c0dccfd6
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Dec 8 16:52:25 2007 +0000

    Slightly changed XMP version.
---
 test/data/xmpparser-test.out | 8 ++++----
 xmpsdk/include/XMP_Version.h | 2 +-
 xmpsdk/src/XMPCore_Impl.hpp  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/data/xmpparser-test.out b/test/data/xmpparser-test.out
index 36f1f2c..c22762f 100644
--- a/test/data/xmpparser-test.out
+++ b/test/data/xmpparser-test.out
@@ -31,7 +31,7 @@ Xmp.exif.NativeDigest                        XmpText   414  36864,40960,40961,37
 2c2
 < <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="3.1.2-113">
 ---
-> <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core (Exiv2) 4.1.1">
+> <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.1.1-Exiv2">
 35d34
 <      <rdf:li xml:lang="en-US">Blue Square Test File - .jpg</rdf:li>
 37a37
@@ -100,7 +100,7 @@ Xmp.wine.Recommend                           XmpText     5  False
 2c2
 < <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="3.1.2-113">
 ---
-> <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core (Exiv2) 4.1.1">
+> <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.1.1-Exiv2">
 4c4
 <   <rdf:Description rdf:about="uuid:0f410644-9396-11d9-bb8e-a67e6693b6e9"
 ---
@@ -214,7 +214,7 @@ Xmp.ns1.NestedStructProp/ns2:Outer/ns2:Middle/ns2:Inner/ns2:Field2 XmpText    12
 <     </rdf:RDF>
 ---
 > <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-> <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core (Exiv2) 4.1.1">
+> <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.1.1-Exiv2">
 >  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 >   <rdf:Description rdf:about=""
 >     xmlns:ns1="ns:test1/"
@@ -305,7 +305,7 @@ Xmp.xmpBJ.JobRef[1]/stJob:role               XmpText    12  Photographer
 Xmp.xmpBJ.JobRef[2]/stJob:name               XmpText    16  Wedding ceremony
 Xmp.xmpBJ.JobRef[2]/stJob:role               XmpText     8  Best man
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core (Exiv2) 4.1.1">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.1.1-Exiv2">
  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
   <rdf:Description rdf:about=""
     xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/xmpsdk/include/XMP_Version.h b/xmpsdk/include/XMP_Version.h
index ed41d14..8cb56d0 100644
--- a/xmpsdk/include/XMP_Version.h
+++ b/xmpsdk/include/XMP_Version.h
@@ -38,7 +38,7 @@ versions.
 #define XMP_API_VERSION_MICRO  1
 
 #define XMP_API_VERSION 4.1
-#define XMP_API_VERSION_STRING "4.1.1"
+#define XMP_API_VERSION_STRING "4.1.1-Exiv2"
 
 /* ============================================================================================= */
 
diff --git a/xmpsdk/src/XMPCore_Impl.hpp b/xmpsdk/src/XMPCore_Impl.hpp
index 1c3312e..c5e024d 100644
--- a/xmpsdk/src/XMPCore_Impl.hpp
+++ b/xmpsdk/src/XMPCore_Impl.hpp
@@ -122,7 +122,7 @@ extern WXMP_Result		void_wResult;
 						          (XMP_API_VERSION_MINOR << 16) |	\
 						          (XMP_API_VERSION_MICRO << 8) )
 
-	#define kXMPCoreName "XMP Core (Exiv2)"
+	#define kXMPCoreName "XMP Core"
 	#define kXMPCore_VersionMessage	kXMPCoreName " " XMP_API_VERSION_STRING
 // =================================================================================================
 // Support for asserts

-- 
exiv2 packaging