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

The following commit has been merged in the master branch:
commit c3477b203ae1b7a847ebd7eacb78ca17c2fe816a
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Dec 28 12:21:41 2009 +0000

    Tweaked test scripts for portability.
---
 test/tiff-test.sh      | 9 ++++++++-
 test/xmpparser-test.sh | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/test/tiff-test.sh b/test/tiff-test.sh
index 037fe79..d93caf9 100644
--- a/test/tiff-test.sh
+++ b/test/tiff-test.sh
@@ -2,6 +2,13 @@
 # TIFF parser test driver
 
 # ----------------------------------------------------------------------
+# Check if xmpparser-test exists
+if [ `which exifprobe`x = x ] ; then
+    echo "tiff-test.sh: exifprobe not found. Skipping TIFF tests."
+    exit 0
+fi
+
+# ----------------------------------------------------------------------
 # Setup
 results="./tmp/tiff-test.out"
 good="./data/tiff-test.out"
@@ -25,7 +32,7 @@ exifprobe $testfile
 
 # ----------------------------------------------------------------------
 # Evaluate results
-cat $results | tr -d '
' > $results-stripped
+cat $results | sed 's/\x0d$//' > $results-stripped
 diff -q $results-stripped $good
 rc=$?
 if [ $rc -eq 0 ] ; then
diff --git a/test/xmpparser-test.sh b/test/xmpparser-test.sh
index ab283c4..e597bc2 100755
--- a/test/xmpparser-test.sh
+++ b/test/xmpparser-test.sh
@@ -58,7 +58,7 @@ $exiv2 -v -px exiv2-empty.jpg
 
 # ----------------------------------------------------------------------
 # Evaluate results
-cat $results | tr -d '
' > $results-stripped
+cat $results | sed 's/\x0d$//' > $results-stripped
 diff -q $results-stripped $good
 rc=$?
 if [ $rc -eq 0 ] ; then

-- 
exiv2 packaging