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

The following commit has been merged in the master branch:
commit cbc3788eecd43dc6c8f97a70e6a3ee21129809ac
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Apr 25 05:24:34 2012 +0000

    filter out <CR> for cygwin
---
 test/exifdata-test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/exifdata-test.sh b/test/exifdata-test.sh
index 1b52fe0..13fd239 100755
--- a/test/exifdata-test.sh
+++ b/test/exifdata-test.sh
@@ -24,7 +24,7 @@ cd ./tmp
 $samples/exifdata-test exiv2-gc.jpg
 $samples/exifdata-test exiv2-canon-powershot-s40.jpg
 $samples/exifdata-test exiv2-nikon-d70.jpg
-) > $results
+)  | tr -d '
' > $results
 
 diff -q $diffargs $results $good
 rc=$?

-- 
exiv2 packaging