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

The following commit has been merged in the master branch:
commit 7094254bd31a947939fae53dd36e7ebceed96502
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Aug 29 16:43:11 2015 +0000

    #640 #751  Fix to test suit to prevent crash in exiv2json -x test/data/BlueSquare.xmp (see #751 for discussion)
---
 test/bugfixes-test.sh       |   4 +--
 test/data/BlueSquare.xmp    |  60 ++++++++++++++++++++++----------------------
 test/data/bugfixes-test.out | Bin 1835223 -> 1840788 bytes
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index 89bcf8d..4dd42fb 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -371,8 +371,8 @@ source ./functions.source
 	echo '------>' Bug $num '<-------' >&2
 	copyTestFile BlueSquare.xmp   $filename1
 	copyTestFile exiv2-bug784.jpg $filename2
-	# runTest exiv2json        $filename1   TODO: This is Throwing
-	# runTest exiv2json x      $filename1   Caught Exiv2 exception 'XMP Toolkit error 9: Fatal namespace map problem'
+	runTest exiv2json        $filename1
+	runTest exiv2json x      $filename1
     runTest exiv2json        $filename2
 
 	num=1058
diff --git a/test/data/BlueSquare.xmp b/test/data/BlueSquare.xmp
index 65337cd..0dad52e 100644
--- a/test/data/BlueSquare.xmp
+++ b/test/data/BlueSquare.xmp
@@ -3,19 +3,19 @@
  <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/"
-    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/"
     xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"
     xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/"
     xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
     xmlns:exif="http://ns.adobe.com/exif/1.0/"
    dc:format="image/jpeg"
-   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"
    photoshop:ColorMode="3"
    photoshop:ICCProfile="sRGB IEC61966-2.1"
    tiff:Orientation="1"
@@ -51,7 +51,7 @@
      <rdf:li>.jpg</rdf:li>
     </rdf:Bag>
    </dc:subject>
-   <xapMM:DerivedFrom
+   <xmpMM:DerivedFrom
     stRef:instanceID="uuid:9A3B7F4F214211DAB6308A7391270C13"
     stRef:documentID="uuid:9A3B7F4E214211DAB6308A7391270C13"/>
    <tiff:BitsPerSample>
@@ -64,25 +64,25 @@
   </rdf:Description>
  </rdf:RDF>
 </x:xmpmeta>
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                           
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 <?xpacket end="w"?>
\ No newline at end of file
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 7d2e437..5592290 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ

-- 
exiv2 packaging