[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=0e96ca6

The following commit has been merged in the master branch:
commit 0e96ca65ab7a430981a866e28b9ce8f406ef0116
Author: vog <vog at notjusthosting.com>
Date:   Fri Sep 14 18:19:41 2012 +0000

    Issue #847: Adjust preview tests to latest EpsImage changes
---
 ...-preview1.jpg => eps-old-r2872_01-preview1.jpg} | Bin
 ...-preview1.jpg => eps-old-r2872_02-preview1.jpg} | Bin
 ...-preview1.jpg => eps-old-r2872_03-preview1.jpg} | Bin
 ...-preview1.jpg => eps-old-r2872_04-preview1.jpg} | Bin
 test/data/preview/preview-test.out                 |  42 ++++++++++++++++++++-
 test/preview-test.sh                               |   4 ++
 6 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/test/data/preview/eps-flat_photoshop-cs5-ascii-colorprofile-preview1.jpg b/test/data/preview/eps-old-r2872_01-preview1.jpg
similarity index 100%
copy from test/data/preview/eps-flat_photoshop-cs5-ascii-colorprofile-preview1.jpg
copy to test/data/preview/eps-old-r2872_01-preview1.jpg
diff --git a/test/data/preview/eps-flat_photoshop-cs5-ascii-colorprofile-preview1.jpg b/test/data/preview/eps-old-r2872_02-preview1.jpg
similarity index 100%
copy from test/data/preview/eps-flat_photoshop-cs5-ascii-colorprofile-preview1.jpg
copy to test/data/preview/eps-old-r2872_02-preview1.jpg
diff --git a/test/data/preview/eps-flat_photoshop-cs5-ascii-colorprofile-preview1.jpg b/test/data/preview/eps-old-r2872_03-preview1.jpg
similarity index 100%
copy from test/data/preview/eps-flat_photoshop-cs5-ascii-colorprofile-preview1.jpg
copy to test/data/preview/eps-old-r2872_03-preview1.jpg
diff --git a/test/data/preview/eps-flat_photoshop-e9-win-doseps-preview1.jpg b/test/data/preview/eps-old-r2872_04-preview1.jpg
similarity index 100%
copy from test/data/preview/eps-flat_photoshop-e9-win-doseps-preview1.jpg
copy to test/data/preview/eps-old-r2872_04-preview1.jpg
diff --git a/test/data/preview/preview-test.out b/test/data/preview/preview-test.out
index 8b878ad..e3f05ae 100644
--- a/test/data/preview/preview-test.out
+++ b/test/data/preview/preview-test.out
@@ -271,12 +271,12 @@ Exit code: 0
 -----> eps-flat_photoshop-cs5-binary_exiv2_missing-begin-xml-packet.eps <-----
 
 Command: exiv2 -pp eps-flat_photoshop-cs5-binary_exiv2_missing-begin-xml-packet.eps
-Warning: Missing %begin_xml_packet in Photoshop EPS at position: 1396
+Warning: Missing %begin_xml_packet in Photoshop EPS at position: 8560
 Preview 1: image/jpeg, 37x47 pixels, 854 bytes
 Exit code: 0
 
 Command: exiv2 -f -ep eps-flat_photoshop-cs5-binary_exiv2_missing-begin-xml-packet.eps
-Warning: Missing %begin_xml_packet in Photoshop EPS at position: 1396
+Warning: Missing %begin_xml_packet in Photoshop EPS at position: 8560
 Exit code: 0
 
 -----> eps-flat_photoshop-cs5-binary_no-adocontainsxmp.eps <-----
@@ -483,6 +483,44 @@ Exit code: 0
 Command: exiv2 -f -ep eps-nested_xmp_oodraw-lev2-pre.eps
 Exit code: 0
 
+-----> eps-old-r2872_01.eps <-----
+
+Command: exiv2 -pp eps-old-r2872_01.eps
+Preview 1: image/jpeg, 37x47 pixels, 854 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-old-r2872_01.eps
+Exit code: 0
+
+-----> eps-old-r2872_02.eps <-----
+
+Command: exiv2 -pp eps-old-r2872_02.eps
+Preview 1: image/jpeg, 37x47 pixels, 854 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-old-r2872_02.eps
+Exit code: 0
+
+-----> eps-old-r2872_03.eps <-----
+
+Command: exiv2 -pp eps-old-r2872_03.eps
+Warning: Missing %begin_xml_packet in Photoshop EPS at position: 1396
+Preview 1: image/jpeg, 37x47 pixels, 854 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-old-r2872_03.eps
+Warning: Missing %begin_xml_packet in Photoshop EPS at position: 1396
+Exit code: 0
+
+-----> eps-old-r2872_04.eps <-----
+
+Command: exiv2 -pp eps-old-r2872_04.eps
+Preview 1: image/jpeg, 160x120 pixels, 2252 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-old-r2872_04.eps
+Exit code: 0
+
 -----> exiv2-bug443.jpg <-----
 
 Command: exiv2 -pp exiv2-bug443.jpg
diff --git a/test/preview-test.sh b/test/preview-test.sh
index fb69f50..adf4c94 100755
--- a/test/preview-test.sh
+++ b/test/preview-test.sh
@@ -70,6 +70,10 @@ images="eps/eps-flat_coreldraw-x3-lev2.eps \
         eps/eps-nested_xmp_indesign-cs5-lev3_failure-exiftool-8.56.eps \
         eps/eps-nested_xmp_oodraw-lev2-epsi.eps \
         eps/eps-nested_xmp_oodraw-lev2-pre.eps \
+        eps/eps-old-r2872_01.eps \
+        eps/eps-old-r2872_02.eps \
+        eps/eps-old-r2872_03.eps \
+        eps/eps-old-r2872_04.eps \
         exiv2-bug443.jpg \
         exiv2-bug444.jpg \
         exiv2-bug445.jpg \

-- 
exiv2 packaging