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

Thu Jul 13 17:42:32 UTC 2017

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

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

    Improved order of preview test images, removed duplicate entries
---
 test/data/preview/preview-test.out | 95 ++++++++++++++------------------------
 test/preview-test.sh               | 15 +++---
 2 files changed, 40 insertions(+), 70 deletions(-)

diff --git a/test/data/preview/preview-test.out b/test/data/preview/preview-test.out
index b06552f..964353a 100644
--- a/test/data/preview/preview-test.out
+++ b/test/data/preview/preview-test.out
@@ -26,6 +26,15 @@ Exit code: 0
 Command: exiv2 -f -ep eps-flat_oodraw_ai-9-lev2.eps
 Exit code: 0
 
+-----> eps-flat_oodraw_ai-cs-lev2.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-cs-lev2.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-cs-lev2.eps
+Exit code: 0
+
 -----> eps-flat_oodraw_ai-cs2-lev2.eps <-----
 
 Command: exiv2 -pp eps-flat_oodraw_ai-cs2-lev2.eps
@@ -71,6 +80,16 @@ Exit code: 0
 Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3-nodocthumb.eps
 Exit code: 0
 
+-----> eps-flat_oodraw_ai-cs5-lev3-preview.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3-preview.eps
+Preview 1: image/tiff, 213x170 pixels, 37902 bytes
+Preview 2: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3-preview.eps
+Exit code: 0
+
 -----> eps-flat_oodraw_ai-cs5-lev3.eps <-----
 
 Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3.eps
@@ -89,25 +108,6 @@ Exit code: 0
 Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3_ns-xapGImg.eps
 Exit code: 0
 
------> eps-flat_oodraw_ai-cs5-lev3-preview.eps <-----
-
-Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3-preview.eps
-Preview 1: image/tiff, 213x170 pixels, 37902 bytes
-Preview 2: image/jpeg, 256x208 pixels, 3166 bytes
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3-preview.eps
-Exit code: 0
-
------> eps-flat_oodraw_ai-cs-lev2.eps <-----
-
-Command: exiv2 -pp eps-flat_oodraw_ai-cs-lev2.eps
-Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_oodraw_ai-cs-lev2.eps
-Exit code: 0
-
 -----> eps-flat_photoshop-e9-win-doseps.eps <-----
 
 Command: exiv2 -pp eps-flat_photoshop-e9-win-doseps.eps
@@ -356,31 +356,31 @@ Exit code: 0
 Command: exiv2 -f -ep imagemagick.pgf
 Exit code: 0
 
------> iptc-psAPP13-noIPTC.jpg <-----
+-----> iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg <-----
 
-Command: exiv2 -pp iptc-psAPP13-noIPTC.jpg
+Command: exiv2 -pp iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg
 Preview 1: image/jpeg, 160x114 pixels, 938 bytes
 Exit code: 0
 
-Command: exiv2 -f -ep iptc-psAPP13-noIPTC.jpg
+Command: exiv2 -f -ep iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg
 Exit code: 0
 
------> iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg <-----
+-----> iptc-psAPP13-noIPTC.jpg <-----
 
-Command: exiv2 -pp iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg
+Command: exiv2 -pp iptc-psAPP13-noIPTC.jpg
 Preview 1: image/jpeg, 160x114 pixels, 938 bytes
 Exit code: 0
 
-Command: exiv2 -f -ep iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg
+Command: exiv2 -f -ep iptc-psAPP13-noIPTC.jpg
 Exit code: 0
 
------> iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg <-----
+-----> iptc-psAPP13-wIPTC-psAPP13-noIPTC.jpg <-----
 
-Command: exiv2 -pp iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg
+Command: exiv2 -pp iptc-psAPP13-wIPTC-psAPP13-noIPTC.jpg
 Preview 1: image/jpeg, 160x114 pixels, 938 bytes
 Exit code: 0
 
-Command: exiv2 -f -ep iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg
+Command: exiv2 -f -ep iptc-psAPP13-wIPTC-psAPP13-noIPTC.jpg
 Exit code: 0
 
 -----> iptc-psAPP13-wIPTC1-psAPP13-wIPTC2.jpg <-----
@@ -401,15 +401,6 @@ Exit code: 0
 Command: exiv2 -f -ep iptc-psAPP13-wIPTCbeg.jpg
 Exit code: 0
 
------> iptc-psAPP13-wIPTCempty.jpg <-----
-
-Command: exiv2 -pp iptc-psAPP13-wIPTCempty.jpg
-Preview 1: image/jpeg, 160x114 pixels, 938 bytes
-Exit code: 0
-
-Command: exiv2 -f -ep iptc-psAPP13-wIPTCempty.jpg
-Exit code: 0
-
 -----> iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg <-----
 
 Command: exiv2 -pp iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg
@@ -419,13 +410,13 @@ Exit code: 0
 Command: exiv2 -f -ep iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg
 Exit code: 0
 
------> iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg <-----
+-----> iptc-psAPP13-wIPTCempty.jpg <-----
 
-Command: exiv2 -pp iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg
+Command: exiv2 -pp iptc-psAPP13-wIPTCempty.jpg
 Preview 1: image/jpeg, 160x114 pixels, 938 bytes
 Exit code: 0
 
-Command: exiv2 -f -ep iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg
+Command: exiv2 -f -ep iptc-psAPP13-wIPTCempty.jpg
 Exit code: 0
 
 -----> iptc-psAPP13-wIPTCend.jpg <-----
@@ -437,24 +428,6 @@ Exit code: 0
 Command: exiv2 -f -ep iptc-psAPP13-wIPTCend.jpg
 Exit code: 0
 
------> iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg <-----
-
-Command: exiv2 -pp iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg
-Preview 1: image/jpeg, 160x114 pixels, 938 bytes
-Exit code: 0
-
-Command: exiv2 -f -ep iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg
-Exit code: 0
-
------> iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg <-----
-
-Command: exiv2 -pp iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg
-Preview 1: image/jpeg, 160x114 pixels, 938 bytes
-Exit code: 0
-
-Command: exiv2 -f -ep iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg
-Exit code: 0
-
 -----> iptc-psAPP13-wIPTCmid.jpg <-----
 
 Command: exiv2 -pp iptc-psAPP13-wIPTCmid.jpg
@@ -464,13 +437,13 @@ Exit code: 0
 Command: exiv2 -f -ep iptc-psAPP13-wIPTCmid.jpg
 Exit code: 0
 
------> iptc-psAPP13-wIPTC-psAPP13-noIPTC.jpg <-----
+-----> iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg <-----
 
-Command: exiv2 -pp iptc-psAPP13-wIPTC-psAPP13-noIPTC.jpg
+Command: exiv2 -pp iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg
 Preview 1: image/jpeg, 160x114 pixels, 938 bytes
 Exit code: 0
 
-Command: exiv2 -f -ep iptc-psAPP13-wIPTC-psAPP13-noIPTC.jpg
+Command: exiv2 -f -ep iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg
 Exit code: 0
 
 -----> smiley2.jpg <-----
diff --git a/test/preview-test.sh b/test/preview-test.sh
index 62530f6..ef96414 100755
--- a/test/preview-test.sh
+++ b/test/preview-test.sh
@@ -22,15 +22,15 @@ fi
 images="eps/eps-flat_oodraw_ai-10-lev2.eps \
         eps/eps-flat_oodraw_ai-8-lev2.eps \
         eps/eps-flat_oodraw_ai-9-lev2.eps \
+        eps/eps-flat_oodraw_ai-cs-lev2.eps \
         eps/eps-flat_oodraw_ai-cs2-lev2.eps \
         eps/eps-flat_oodraw_ai-cs3-lev2.eps \
         eps/eps-flat_oodraw_ai-cs4-lev2.eps \
         eps/eps-flat_oodraw_ai-cs5-lev2.eps \
         eps/eps-flat_oodraw_ai-cs5-lev3-nodocthumb.eps \
+        eps/eps-flat_oodraw_ai-cs5-lev3-preview.eps \
         eps/eps-flat_oodraw_ai-cs5-lev3.eps \
         eps/eps-flat_oodraw_ai-cs5-lev3_ns-xapGImg.eps \
-        eps/eps-flat_oodraw_ai-cs5-lev3-preview.eps \
-        eps/eps-flat_oodraw_ai-cs-lev2.eps \
         eps/eps-flat_photoshop-e9-win-doseps.eps \
         exiv2-bug443.jpg \
         exiv2-bug444.jpg \
@@ -57,19 +57,16 @@ images="eps/eps-flat_oodraw_ai-10-lev2.eps \
         exiv2-sony-dsc-w7.jpg \
         glider.exv \
         imagemagick.pgf \
-        iptc-psAPP13-noIPTC.jpg \
-        iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg \
         iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg \
+        iptc-psAPP13-noIPTC.jpg \
+        iptc-psAPP13-wIPTC-psAPP13-noIPTC.jpg \
         iptc-psAPP13-wIPTC1-psAPP13-wIPTC2.jpg \
         iptc-psAPP13-wIPTCbeg.jpg \
-        iptc-psAPP13-wIPTCempty.jpg \
-        iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg \
         iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg \
+        iptc-psAPP13-wIPTCempty.jpg \
         iptc-psAPP13-wIPTCend.jpg \
-        iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg \
-        iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg \
         iptc-psAPP13-wIPTCmid.jpg \
-        iptc-psAPP13-wIPTC-psAPP13-noIPTC.jpg \
+        iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg \
         smiley2.jpg"
 (
     for filepath in $images; do

-- 
exiv2 packaging

