[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=083a685

The following commit has been merged in the master branch:
commit 083a685b2561ae96d8be77cf98e3118f0ec2e62e
Author: vog <vog at notjusthosting.com>
Date:   Wed Jun 29 17:40:35 2011 +0000

    Fixed EPS test suite: use GNU SED to ensure that SED won't add a line ending at EOF which would make the test comparisons fail
---
 test/eps-test.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/eps-test.sh b/test/eps-test.sh
index c3c0af0..86d7e7f 100755
--- a/test/eps-test.sh
+++ b/test/eps-test.sh
@@ -12,6 +12,7 @@ else
     bin="$VALGRIND $EXIV2_BINDIR"
     samples="$VALGRIND $EXIV2_BINDIR"
 fi
+gsed=`gsed --help >/dev/null 2>&1 && echo g`sed
 exiv2version="`$bin/exiv2 -V | sed -n '1 s,^exiv2 \([^ ]*\).*,
,p'`"
 if [ -z "$exiv2version" ]; then
     echo "Error: Unable to determine Exiv2 version"
@@ -73,7 +74,7 @@ done
             continue
         fi
 
-        sed "s, at Exiv2Version@,$exiv2version," < "../data/eps/$image.eps.newxmp" > "$image.eps.newxmp"
+        $gsed "s, at Exiv2Version@,$exiv2version," < "../data/eps/$image.eps.newxmp" > "$image.eps.newxmp"
 
         if ! diff -q "$image.eps.newxmp" "$image.eps" ; then
             continue

-- 
exiv2 packaging