[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=0dc551c

The following commit has been merged in the master branch:
commit 0dc551c918d12773f3ec0cb1dcabbb092e583e0b
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Jan 15 04:29:02 2013 +0000

    test: fixed incorrect difference report from test 666 on Linux
---
 test/functions.source | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/functions.source b/test/functions.source
index d0a0e35..937da60 100644
--- a/test/functions.source
+++ b/test/functions.source
@@ -72,11 +72,11 @@ copyTestFiles()
 # result analysis
 reportTest()
 {
-	if [ -e `which dos2unix` ]; then
-	    sed 's,\,/,g' $results > ${results}-new
+    cat $results | tr \ / > ${results}-new
     	mv -f ${results}-new $results
-	    unix2dos $results >/dev/null 2>&1
-	fi
+    if [ ! -z `which dos2unix` ]; then
+        unix2dos $results >/dev/null 2>&1
+    fi
 
     if [ $# -eq 0 ]; then
         lhs=$results
@@ -93,9 +93,9 @@ reportTest()
     fi
 
     if [ "$PLATFORM" == "cygwin" ]; then
-    	diff -q $diffargs $(cygpath -aw $lhs) $(cygpath -aw $rhs)
+        diff -q $diffargs $(cygpath -aw $lhs) $(cygpath -aw $rhs)
     else
-    	diff -q $diffargs $lhs $rhs
+        diff -q $diffargs $lhs $rhs
     fi
     rc=$?
     if [ $rc -eq 0 ] ; then

-- 
exiv2 packaging