[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=6f7095c

The following commit has been merged in the master branch:
commit 6f7095c529c13e652324fa00aebb75cbe6befe54
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Thu Mar 26 07:09:54 2015 +0000

    Fix typo in r3633 and update bugfixes-test.out accordingly.
---
 test/bugfixes-test.sh       |   1 +
 test/data/bugfixes-test.out | Bin 134917 -> 134882 bytes
 test/functions.source       |   2 +-
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index 77ff71b..a527fb8 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -211,6 +211,7 @@ source ./functions.source
 
 	num=812 # updating a hardlinked file can "empty" the other files!
 	printf "$num " >&3
+	echo '------>' Bug $num '<-------' >&2
 	copyTestFile exiv2-bug884c.jpg bug$num.jpg
 	hardLinkFiles                  bug$num.jpg bug$num-B.jpg bug$num-C.jpg
 	runTest exiv2 -u -v -M"set Exif.Photo.UserComment Test Bug $num" bug$num.jpg
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 6799821..7a03559 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ
diff --git a/test/functions.source b/test/functions.source
index 4c75fab..4b9549e 100644
--- a/test/functions.source
+++ b/test/functions.source
@@ -355,7 +355,7 @@ hardLinkFiles()
 	target="$1"
 	shift
 	for var; do
-		if [ -e var ]; then rm -rf $var ; fi
+		if [ -e $var ]; then rm -rf $var ; fi
 		ln $target $var
 	done
 }

-- 
exiv2 packaging