[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=6dd85c6

The following commit has been merged in the master branch:
commit 6dd85c6a6bed89fa404feefcd3feec776e4c7a4f
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Sep 2 15:26:46 2011 +0000

    Fixed tests and results for (my installation of) MSYS/MinGW.
---
 test/bugfixes-test.sh       |   4 +++-
 test/data/bugfixes-test.out | Bin 83659 -> 83613 bytes
 test/exiv2-test.sh          |   2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index 4c342ca..03fee89 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -152,7 +152,9 @@ num=683
 filename=exiv2-bug$num.jpg
 cp -f ../data/exiv2-nikon-d70.jpg $filename
 echo '------>' Bug $num '<-------' >&2
-$bin/exiv2 -u -v -f -r %Y-%m-%d-%a-%j $filename
+rm -f 2004-03-30-Tue-090.jpg
+$bin/exiv2 -u -f -r %Y-%m-%d-%a-%j $filename
+ls 2004-03-30-Tue-090.jpg
 
 num=711
 # Little endian (II)
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index d0ffc92..0e50d1c 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ
diff --git a/test/exiv2-test.sh b/test/exiv2-test.sh
index 55cadb8..7fa29a8 100755
--- a/test/exiv2-test.sh
+++ b/test/exiv2-test.sh
@@ -129,7 +129,7 @@ diff iii kkk
 if [ `../config/config.guess` = "i686-pc-mingw32" ] ; then
     sed 's,\,/,g' $results > ${results}-new
     mv -f ${results}-new $results
-    unix2dos -q $results
+    unix2dos $results >/dev/null 2>&1
 fi
 
 diff -q -w $diffargs $results $good

-- 
exiv2 packaging