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

The following commit has been merged in the master branch:
commit c6025cdd2a1d7d5ffe73eed6e44a61d68203ce00
Author: brad <chickb at gmail.com>
Date:   Fri Dec 3 00:10:17 2004 +0000

    added --strip-trailing-cr for running test cases on win32
---
 test/addmoddel.sh  | 4 ++--
 test/write-test.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/addmoddel.sh b/test/addmoddel.sh
index 7f9188f..1133a26 100755
--- a/test/addmoddel.sh
+++ b/test/addmoddel.sh
@@ -10,10 +10,10 @@ $binpath/addmoddel exiv2-empty.jpg
 $binpath/exiv2 -pv exiv2-empty.jpg
 ) > $results
 
-diff -q $results $good
+diff -q --strip-trailing-cr $results $good
 rc=$?
 if [ $rc -eq 0 ] ; then
     echo "All testcases passed."
 else
-    diff $results $good
+    diff --strip-trailing-cr $results $good
 fi
diff --git a/test/write-test.sh b/test/write-test.sh
index c2f84c7..4f6f571 100755
--- a/test/write-test.sh
+++ b/test/write-test.sh
@@ -59,10 +59,10 @@ runTestCase 11 $datapath/exiv2-nikon-d70.jpg
 
 ) > tmp/write-test.out 2>&1
 
-diff -q tmp/write-test.out data/write-test.out
+diff -q --strip-trailing-cr tmp/write-test.out data/write-test.out
 rc=$?
 if [ $rc -eq 0 ] ; then
     echo "All testcases passed."
 else
-    diff tmp/write-test.out data/write-test.out
+    diff --strip-trailing-cr tmp/write-test.out data/write-test.out
 fi

-- 
exiv2 packaging