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

The following commit has been merged in the master branch:
commit e17e9d7c2d81bf249f9ccb9d576c101f173b8b48
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Dec 27 10:54:03 2009 +0000

    Another try to get rid of the DOS newline in a manner which works on other platforms too.
---
 test/bugfixes-test.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index 667f856..b4f53c2 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -101,8 +101,7 @@ $exiv2 -pt $filename
 
 # ----------------------------------------------------------------------
 # Evaluate results
-#cat $results | tr -d '
' > $results-stripped
-cp $results $results-stripped
+cat $results | sed 's/\x0d$//' > $results-stripped
 diff -q $results-stripped $good
 rc=$?
 if [ $rc -eq 0 ] ; then

-- 
exiv2 packaging