[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=170a74c

The following commit has been merged in the master branch:
commit 170a74c7235fc9f8e0d38c0cc249c7cb7778ba5d
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Oct 20 05:50:07 2012 +0000

    Fix xmpparser-test.sh and conversion.sh to look in <exiv2-dir>/bin for executables.  Remove dead code from exifdata-test.sh
---
 test/conversions.sh    | 2 +-
 test/exifdata-test.sh  | 2 --
 test/xmpparser-test.sh | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/conversions.sh b/test/conversions.sh
index 56fe225..67dcd11 100755
--- a/test/conversions.sh
+++ b/test/conversions.sh
@@ -15,7 +15,7 @@ cd ./tmp
 
 # ----------------------------------------------------------------------
 # Check if xmpparser-test exists
-if [ ! -e ../../samples/xmpparser-test -a ! -e "$EXIV2_BINDIR/xmpparser-test" ] ; then
+if [ ! -e ../../bin/xmpparser-test -a ! -e "$EXIV2_BINDIR/xmpparser-test" ] ; then
     echo "xmpparser-test not found. Assuming XMP support is not enabled."
     exit 0
 fi
diff --git a/test/exifdata-test.sh b/test/exifdata-test.sh
index 6b7dcc2..cca7c52 100755
--- a/test/exifdata-test.sh
+++ b/test/exifdata-test.sh
@@ -12,10 +12,8 @@ fi
 (
 if [ -z "$EXIV2_BINDIR" ] ; then
     bin="$VALGRIND ../../bin"
-    samples="$VALGRIND ../../bin"
 else
     bin="$VALGRIND $EXIV2_BINDIR"
-    samples="$VALGRIND $EXIV2_BINDIR"
 fi
 cp -f ./data/exiv2-gc.jpg ./tmp
 cp -f ./data/exiv2-canon-powershot-s40.jpg ./tmp
diff --git a/test/xmpparser-test.sh b/test/xmpparser-test.sh
index 2b358a5..dcaa98d 100755
--- a/test/xmpparser-test.sh
+++ b/test/xmpparser-test.sh
@@ -15,7 +15,7 @@ cd ./tmp
 
 # ----------------------------------------------------------------------
 # Check if xmpparser-test exists
-if [ ! -e ../../samples/xmpparser-test -a ! -e "$EXIV2_BINDIR/xmpparser-test" ] ; then
+if [ ! -e ../../bin/xmpparser-test -a ! -e "$EXIV2_BINDIR/xmpparser-test" ] ; then
     echo "xmpparser-test not found. Assuming XMP support is not enabled."
     exit 0
 fi

-- 
exiv2 packaging