[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=875cb08

The following commit has been merged in the master branch:
commit 875cb0892e867141eb2a2b87d3ef28ee71edf871
Author: brad <chickb at gmail.com>
Date:   Sat Dec 11 20:40:56 2004 +0000

    added --strip-trailing-cr to fix test problems on win32
---
 test/exiv2-test.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/exiv2-test.sh b/test/exiv2-test.sh
index 8206c3e..ec94d78 100755
--- a/test/exiv2-test.sh
+++ b/test/exiv2-test.sh
@@ -85,10 +85,10 @@ diff iii kkk
 
 ) > $results 2>&1
 
-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

-- 
exiv2 packaging