[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:40:39 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=d36dc4b

The following commit has been merged in the master branch:
commit d36dc4b859c4fb39506ca9e0b6c0fcb0466f9740
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Jul 11 03:45:43 2009 +0000

    #600: Upgrading XMP-Toolkit to version 4.4; updated test results.
---
 test/data/xmpparser-test.out | 85 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 76 insertions(+), 9 deletions(-)

diff --git a/test/data/xmpparser-test.out b/test/data/xmpparser-test.out
index 4fe1c65..3a9572f 100644
--- a/test/data/xmpparser-test.out
+++ b/test/data/xmpparser-test.out
@@ -31,11 +31,35 @@ 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 4.1.1-Exiv2">
+> <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
+6,7c6,7
+<     xmlns:xap="http://ns.adobe.com/xap/1.0/"
+<     xmlns:xapMM="http://ns.adobe.com/xap/1.0/mm/"
+---
+>     xmlns:xmp="http://ns.adobe.com/xap/1.0/"
+>     xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
+13,18c13,18
+<    xap:CreatorTool="Adobe Photoshop CS2 Macintosh"
+<    xap:CreateDate="2005-09-07T15:07:40-07:00"
+<    xap:ModifyDate="2005-09-07T15:09:51-07:00"
+<    xap:MetadataDate="2006-04-10T13:37:10-07:00"
+<    xapMM:DocumentID="uuid:9A3B7F52214211DAB6308A7391270C13"
+<    xapMM:InstanceID="uuid:B59AC1B3214311DAB6308A7391270C13"
+---
+>    xmp:CreatorTool="Adobe Photoshop CS2 Macintosh"
+>    xmp:CreateDate="2005-09-07T15:07:40-07:00"
+>    xmp:ModifyDate="2005-09-07T15:09:51-07:00"
+>    xmp:MetadataDate="2006-04-10T13:37:10-07:00"
+>    xmpMM:DocumentID="uuid:9A3B7F52214211DAB6308A7391270C13"
+>    xmpMM:InstanceID="uuid:B59AC1B3214311DAB6308A7391270C13"
 35d34
 <      <rdf:li xml:lang="en-US">Blue Square Test File - .jpg</rdf:li>
 37a37
 >      <rdf:li xml:lang="en-US">Blue Square Test File - .jpg</rdf:li>
+54c54
+<    <xapMM:DerivedFrom
+---
+>    <xmpMM:DerivedFrom
 -----> Decoding XMP data read from StaffPhotographer-Example.xmp <-----
 Xmp.iptc.IntellectualGenre                   XmpText     7  Profile
 Xmp.iptc.Location                            XmpText    17  Moore family farm
@@ -100,13 +124,56 @@ 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 4.1.1-Exiv2">
+> <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
 4c4
 <   <rdf:Description rdf:about="uuid:0f410644-9396-11d9-bb8e-a67e6693b6e9"
 ---
 >   <rdf:Description rdf:about=""
-46a47
->    xapMM:InstanceID="uuid:0f410644-9396-11d9-bb8e-a67e6693b6e9"
+9,10c9,10
+<     xmlns:xap="http://ns.adobe.com/xap/1.0/"
+<     xmlns:xapMM="http://ns.adobe.com/xap/1.0/mm/"
+---
+>     xmlns:xmp="http://ns.adobe.com/xap/1.0/"
+>     xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
+12c12
+<     xmlns:xapRights="http://ns.adobe.com/xap/1.0/rights/"
+---
+>     xmlns:xmpRights="http://ns.adobe.com/xap/1.0/rights/"
+42,48c42,49
+<    xap:CreateDate="2005-03-13T02:01:44-06:00"
+<    xap:ModifyDate="2005-03-13T02:01:44-06:00"
+<    xap:MetadataDate="2007-01-08T13:25:45+01:00"
+<    xap:CreatorTool="Adobe Photoshop CS Windows"
+<    xapMM:DocumentID="adobe:docid:photoshop:0f410643-9396-11d9-bb8e-a67e6693b6e9"
+<    xapRights:WebStatement="http://www.bignewspaper.com/"
+<    xapRights:Marked="True"
+---
+>    xmp:CreateDate="2005-03-13T02:01:44-06:00"
+>    xmp:ModifyDate="2005-03-13T02:01:44-06:00"
+>    xmp:MetadataDate="2007-01-08T13:25:45+01:00"
+>    xmp:CreatorTool="Adobe Photoshop CS Windows"
+>    xmpMM:DocumentID="adobe:docid:photoshop:0f410643-9396-11d9-bb8e-a67e6693b6e9"
+>    xmpMM:InstanceID="uuid:0f410644-9396-11d9-bb8e-a67e6693b6e9"
+>    xmpRights:WebStatement="http://www.bignewspaper.com/"
+>    xmpRights:Marked="True"
+78c79
+<    <xapMM:DerivedFrom
+---
+>    <xmpMM:DerivedFrom
+81c82
+<    <xapRights:RightsUsageTerms>
+---
+>    <xmpRights:RightsUsageTerms>
+85,86c86,87
+<    </xapRights:RightsUsageTerms>
+<    <xapRights:UsageTerms>
+---
+>    </xmpRights:RightsUsageTerms>
+>    <xmpRights:UsageTerms>
+90c91
+<    </xapRights:UsageTerms>
+---
+>    </xmpRights:UsageTerms>
 160,191c161
 <                                                                                                     
 <                                                                                                     
@@ -214,7 +281,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 4.1.1-Exiv2">
+> <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
 >  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 >   <rdf:Description rdf:about=""
 >     xmlns:ns1="ns:test1/"
@@ -306,7 +373,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 4.1.1-Exiv2">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-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/"
@@ -314,7 +381,7 @@ Xmp.xmpBJ.JobRef[2]/stJob:role               XmpText     8  Best man
     xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
     xmlns:xmpDM="http://ns.adobe.com/xmp/1.0/DynamicMedia/"
     xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
-    xmlns:xapBJ="http://ns.adobe.com/xap/1.0/bj/"
+    xmlns:xmpBJ="http://ns.adobe.com/xap/1.0/bj/"
     xmlns:stJob="http://ns.adobe.com/xap/1.0/sType/Job#"
    dc:source="xmpsample.cpp"
    dc:one="-1"
@@ -372,7 +439,7 @@ Xmp.xmpBJ.JobRef[2]/stJob:role               XmpText     8  Best man
     stDim:w="16"
     stDim:h="9"
     stDim:unit="inch"/>
-   <xapBJ:JobRef>
+   <xmpBJ:JobRef>
     <rdf:Bag>
      <rdf:li
       stJob:name="Birthday party"
@@ -381,7 +448,7 @@ Xmp.xmpBJ.JobRef[2]/stJob:role               XmpText     8  Best man
       stJob:name="Wedding ceremony"
       stJob:role="Best man"/>
     </rdf:Bag>
-   </xapBJ:JobRef>
+   </xmpBJ:JobRef>
   </rdf:Description>
  </rdf:RDF>
 </x:xmpmeta>

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list