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

The following commit has been merged in the master branch:
commit e9a979446ad2c7137d9d958ec3a5c6d3800ac01d
Author: vog <vog at notjusthosting.com>
Date:   Fri Aug 3 14:49:59 2012 +0000

    #836: Improve test case
---
 test/bugfixes-test.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index 7250943..56cb285 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -237,11 +237,12 @@ $bin/exiv2 -v -pa $filename
 num=836
 filename=exiv2-bug$num.eps
 echo '------>' Bug $num '<-------' >&2
+cp -f ../data/$filename $filename
 if [ -e $filename/rsrc ]; then
     printf "$num " >&3
-    cp $filename.rsrc $filename/rsrc
+    cp -f ../data/$filename.rsrc $filename/rsrc
     $bin/exiv2 -M'set Exif.Photo.UserComment Test' $filename
-    diff -q $filename/rsrc $filename.rsrc
+    diff -q ../data/$filename.rsrc $filename/rsrc
 else
     # skip this test on systems which do not have resource forks
     printf "($num skipped) " >&3

-- 
exiv2 packaging