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

The following commit has been merged in the master branch:
commit bce8b80a88cfe610d57750f1ac62e779b17dc359
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Apr 26 02:29:05 2012 +0000

    Replaced the 16-bit msvc\diff.exe with the msys 32-bit version
    Added msys support dlls required by diff.exe
    Use msvc\diff.exe for use in exiv2-test.sh
    Use dos2unix if available to fix line-endings
---
 msvc/diff.exe               | Bin 24151 -> 151040 bytes
 msvc/path-test/libexpat.dll | Bin 397312 -> 0 bytes
 test/exiv2-test.sh          |   9 ++++++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/msvc/diff.exe b/msvc/diff.exe
index 6b37dd5..40e9143 100644
Binary files a/msvc/diff.exe and b/msvc/diff.exe differ
diff --git a/msvc/path-test/libexpat.dll b/msvc/path-test/libexpat.dll
deleted file mode 100644
index edb5aa4..0000000
Binary files a/msvc/path-test/libexpat.dll and /dev/null differ
diff --git a/test/exiv2-test.sh b/test/exiv2-test.sh
index 7fa29a8..bcd14f8 100755
--- a/test/exiv2-test.sh
+++ b/test/exiv2-test.sh
@@ -1,5 +1,12 @@
 #! /bin/sh
 # Test driver for exiv2 utility tests
+
+os=`uname`
+if [ "${os:0:4}" == "CYGW" ]; then
+	# use the diff.exe in msvc (cygwin's default diff is suspect)
+	export PATH=$PWD/../msvc:$PATH
+fi
+
 export LC_ALL=C
 if [ -z "$EXIV2_BINDIR" ] ; then
     bin="$VALGRIND ../../src"
@@ -126,7 +133,7 @@ diff iii kkk
 
 ) > $results 2>&1
 
-if [ `../config/config.guess` = "i686-pc-mingw32" ] ; then
+if [ -e `which dos2unix` ]; then
     sed 's,\,/,g' $results > ${results}-new
     mv -f ${results}-new $results
     unix2dos $results >/dev/null 2>&1

-- 
exiv2 packaging