[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=50e53e8

The following commit has been merged in the master branch:
commit 50e53e893b3476f596d35a77999bf8c39ad093f0
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Oct 18 18:27:07 2016 +0000

    #1230 Fixing issues with test suite on MinGW/32.
---
 test/bugfixes-test.sh       |   6 +++---
 test/data/bugfixes-test.out | Bin 1923265 -> 1924585 bytes
 test/data/stdin-test.out    |  30 ------------------------------
 test/stdin-test.sh          |   2 +-
 4 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index 8c04453..d549b26 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -445,9 +445,9 @@ source ./functions.source
     runTest exiv2 -pR                   $filename
     copyTestFile      imagemagick.png
     runTest exiv2 -pR imagemagick.png
-    copyTestFile      Reagan.tiff
-    runTest exiv2 -pR Reagan.tiff
-    copyTestFile      Reagan.tiff
+    copyTestFile      ReaganLargeTiff.tiff
+    runTest exiv2 -pR ReaganLargeTiff.tiff
+    copyTestFile      Reagan.jpg
     runTest exiv2 -pR Reagan.jpg
     echo ''
 
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index d4e1ea8..5cbdc4f 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ
diff --git a/test/data/stdin-test.out b/test/data/stdin-test.out
index 70fe682..c051f72 100644
--- a/test/data/stdin-test.out
+++ b/test/data/stdin-test.out
@@ -149,36 +149,6 @@ STRUCTURE OF JPEG FILE: girl.jpg
      372 | 0xffe1 APP1  |    4613 | http://ns.adobe.com/xap/1.0/.<?x
     4987 | 0xffe1 APP1  |    4602 | http://ns.adobe.com/xap/1.0/.<?x
     9591 | 0xffda SOS  
-STRUCTURE OF JPEG FILE: girl.jpg
- address | marker       |  length | data
-       0 | 0xffd8 SOI  
-       2 | 0xffe0 APP0  |      16 | JFIF............
-      20 | 0xffe1 APP1  |    4552 | Exif..II*......................
-    4574 | 0xffe1 APP1  |    4692 | http://ns.adobe.com/xap/1.0/.<?x
-    9268 | 0xffed APP13 |     788 | Photoshop 3.0.8BIM..........Z...
-   10058 | 0xffdb DQT   |      67 
-   10127 | 0xffdb DQT   |      67 
-   10196 | 0xffc0 SOF0  |      17 
-   10215 | 0xffc4 DHT   |      28 
-   10245 | 0xffc4 DHT   |      74 
-   10321 | 0xffc4 DHT   |      28 
-   10351 | 0xffc4 DHT   |      57 
-   10410 | 0xffe1 APP1  |    4602 | http://ns.adobe.com/xap/1.0/.<?x
-   15014 | 0xffda SOS  
-STRUCTURE OF JPEG FILE: girl.jpg
- address | marker       |  length | data
-       0 | 0xffd8 SOI  
-       2 | 0xffe0 APP0  |      16 | JFIF............
-      20 | 0xffdb DQT   |      67 
-      89 | 0xffdb DQT   |      67 
-     158 | 0xffc0 SOF0  |      17 
-     177 | 0xffc4 DHT   |      28 
-     207 | 0xffc4 DHT   |      74 
-     283 | 0xffc4 DHT   |      28 
-     313 | 0xffc4 DHT   |      57 
-     372 | 0xffe1 APP1  |    4613 | http://ns.adobe.com/xap/1.0/.<?x
-    4987 | 0xffe1 APP1  |    4602 | http://ns.adobe.com/xap/1.0/.<?x
-    9591 | 0xffda SOS  
 Warning: Exif tag Exif.Image.InterColorProfile not encoded
 STRUCTURE OF JPEG FILE: girl.jpg
  address | marker       |  length | data
diff --git a/test/stdin-test.sh b/test/stdin-test.sh
index e715caf..81fb0e4 100755
--- a/test/stdin-test.sh
+++ b/test/stdin-test.sh
@@ -29,7 +29,7 @@ source ./functions.source
     done
 
     printf "a (exiv2, xmp, iptc) " >&3
-    for f in Reagan.jpg Reagan.tiff ReaganLargeTiff.tiff ReaganSmallPng.png; do
+    for f in Reagan.jpg ReaganLargeTiff.tiff ReaganSmallPng.png; do
         copyTestFile          $f
         copyTestFile  exiv2-bug1229.jpg            girl.jpg
         runTest exiv2 -pS                          girl.jpg

-- 
exiv2 packaging