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

The following commit has been merged in the master branch:
commit b8ce473aad55fe4658a042df566998f8ccd49521
Author: vog <vog at notjusthosting.com>
Date:   Fri Jul 1 14:09:26 2011 +0000

    Added test case for a *.xmp file that contains an XMP preview
---
 test/data/exiv2-preview-in-xmp.xmp                   |  19 +++++++++++++++++++
 .../exiv2-preview-in-xmp-preview1.jpg}               | Bin
 test/data/preview/preview-test.out                   |   9 +++++++++
 test/preview-test.sh                                 |   1 +
 4 files changed, 29 insertions(+)

diff --git a/test/data/exiv2-preview-in-xmp.xmp b/test/data/exiv2-preview-in-xmp.xmp
new file mode 100644
index 0000000..765d12f
--- /dev/null
+++ b/test/data/exiv2-preview-in-xmp.xmp
@@ -0,0 +1,19 @@
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<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:xmp="http://ns.adobe.com/xap/1.0/"
+    xmlns:xmpGImg="http://ns.adobe.com/xap/1.0/g/img/">
+   <xmp:Thumbnails>
+    <rdf:Alt>
+     <rdf:li
+      xmpGImg:width="150"
+      xmpGImg:height="91"
+      xmpGImg:format="JPEG"
+      xmpGImg:image="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"/>
+    </rdf:Alt>
+   </xmp:Thumbnails>
+  </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+<?xpacket end="w"?>
\ No newline at end of file
diff --git a/test/data/exiv2-bug480.jpg b/test/data/preview/exiv2-preview-in-xmp-preview1.jpg
similarity index 100%
copy from test/data/exiv2-bug480.jpg
copy to test/data/preview/exiv2-preview-in-xmp-preview1.jpg
diff --git a/test/data/preview/preview-test.out b/test/data/preview/preview-test.out
index f212ca0..698cbd5 100644
--- a/test/data/preview/preview-test.out
+++ b/test/data/preview/preview-test.out
@@ -311,6 +311,15 @@ Exit code: 0
 Command: exiv2 -f -ep exiv2-photoshop.psd
 Exit code: 0
 
+-----> exiv2-preview-in-xmp.xmp <-----
+
+Command: exiv2 -pp exiv2-preview-in-xmp.xmp
+Preview 1: image/jpeg, 150x91 pixels, 4745 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-preview-in-xmp.xmp
+Exit code: 0
+
 -----> exiv2-sigma-d10.jpg <-----
 
 Command: exiv2 -pp exiv2-sigma-d10.jpg
diff --git a/test/preview-test.sh b/test/preview-test.sh
index ac020aa..abaf1e6 100755
--- a/test/preview-test.sh
+++ b/test/preview-test.sh
@@ -52,6 +52,7 @@ images="eps/eps-flat_oodraw_ai-10-lev2.eps \
         exiv2-olympus-c8080wz.jpg \
         exiv2-panasonic-dmc-fz5.jpg \
         exiv2-photoshop.psd \
+        exiv2-preview-in-xmp.xmp \
         exiv2-sigma-d10.jpg \
         exiv2-sony-dsc-w7.jpg \
         glider.exv \

-- 
exiv2 packaging