[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=389ea5f

The following commit has been merged in the master branch:
commit 389ea5fc27b27f1ff5135086ea6243f360ed8e6d
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Sep 4 08:29:21 2011 +0000

    Updated test results for corrected MeasuredEV value, tweaks.
---
 test/bugfixes-test.sh       |   2 +-
 test/data/bugfixes-test.out | Bin 83613 -> 83613 bytes
 test/data/exiv2-test.out    |  10 +++++-----
 test/path-test.sh           |   2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index af8bf17..20a10da 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -182,7 +182,7 @@ $bin/exiv2 -u -v -M'set Exif.Image.ProcessingSoftware Intrusive update, writing
 $bin/exiv2 -u -v -PEkyct $filename
 
 # Test easy-access keys (using a dummy bug number)
-if { test -f "$samples/easyaccess-test" || test -f "$samples/easyaccess-test.exe"; }; then
+if { test -f $samples/easyaccess-test || test -f $samples/easyaccess-test.exe; }; then
     num=726
     filename=exiv2-bug$num.jpg
     cp -f ../data/exiv2-empty.jpg $filename
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 0e50d1c..a0be505 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ
diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index 245a0a0..771e421 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -672,7 +672,7 @@ File  2/15: 20031214_000043.jpg
 20031214_000043.jpg   Exif.CanonSi.0x0000                          Short       1  54
 20031214_000043.jpg   Exif.CanonSi.0x0001                          Short       1  0
 20031214_000043.jpg   Exif.CanonSi.ISOSpeed                        Short       1  100
-20031214_000043.jpg   Exif.CanonSi.MeasuredEV                      Short       1  13.62
+20031214_000043.jpg   Exif.CanonSi.MeasuredEV                      Short       1  13.63
 20031214_000043.jpg   Exif.CanonSi.TargetAperture                  Short       1  F5
 20031214_000043.jpg   Exif.CanonSi.TargetShutterSpeed              Short       1  1/501 s
 20031214_000043.jpg   Exif.CanonSi.0x0006                          Short       1  0
@@ -2285,7 +2285,7 @@ Compare image data and extracted data ------------------------------------
 < 20031214_000043.jpg   Exif.CanonSi.0x0000                          Short       1  54
 < 20031214_000043.jpg   Exif.CanonSi.0x0001                          Short       1  0
 < 20031214_000043.jpg   Exif.CanonSi.ISOSpeed                        Short       1  100
-< 20031214_000043.jpg   Exif.CanonSi.MeasuredEV                      Short       1  13.62
+< 20031214_000043.jpg   Exif.CanonSi.MeasuredEV                      Short       1  13.63
 < 20031214_000043.jpg   Exif.CanonSi.TargetAperture                  Short       1  F5
 < 20031214_000043.jpg   Exif.CanonSi.TargetShutterSpeed              Short       1  1/501 s
 < 20031214_000043.jpg   Exif.CanonSi.0x0006                          Short       1  0
@@ -3826,7 +3826,7 @@ Compare image data and extracted data ------------------------------------
 > 20031214_000043.exv   Exif.CanonSi.0x0000                          Short       1  54
 > 20031214_000043.exv   Exif.CanonSi.0x0001                          Short       1  0
 > 20031214_000043.exv   Exif.CanonSi.ISOSpeed                        Short       1  100
-> 20031214_000043.exv   Exif.CanonSi.MeasuredEV                      Short       1  13.62
+> 20031214_000043.exv   Exif.CanonSi.MeasuredEV                      Short       1  13.63
 > 20031214_000043.exv   Exif.CanonSi.TargetAperture                  Short       1  F5
 > 20031214_000043.exv   Exif.CanonSi.TargetShutterSpeed              Short       1  1/501 s
 > 20031214_000043.exv   Exif.CanonSi.0x0006                          Short       1  0
@@ -5587,7 +5587,7 @@ Compare original and inserted image data ---------------------------------
 < 20031214_000043.jpg   Exif.CanonSi.0x0000                          Short       1  54
 < 20031214_000043.jpg   Exif.CanonSi.0x0001                          Short       1  0
 < 20031214_000043.jpg   Exif.CanonSi.ISOSpeed                        Short       1  100
-< 20031214_000043.jpg   Exif.CanonSi.MeasuredEV                      Short       1  13.62
+< 20031214_000043.jpg   Exif.CanonSi.MeasuredEV                      Short       1  13.63
 < 20031214_000043.jpg   Exif.CanonSi.TargetAperture                  Short       1  F5
 < 20031214_000043.jpg   Exif.CanonSi.TargetShutterSpeed              Short       1  1/501 s
 < 20031214_000043.jpg   Exif.CanonSi.0x0006                          Short       1  0
@@ -7128,7 +7128,7 @@ Compare original and inserted image data ---------------------------------
 > 20031214_000043.exv   Exif.CanonSi.0x0000                          Short       1  54
 > 20031214_000043.exv   Exif.CanonSi.0x0001                          Short       1  0
 > 20031214_000043.exv   Exif.CanonSi.ISOSpeed                        Short       1  100
-> 20031214_000043.exv   Exif.CanonSi.MeasuredEV                      Short       1  13.62
+> 20031214_000043.exv   Exif.CanonSi.MeasuredEV                      Short       1  13.63
 > 20031214_000043.exv   Exif.CanonSi.TargetAperture                  Short       1  F5
 > 20031214_000043.exv   Exif.CanonSi.TargetShutterSpeed              Short       1  1/501 s
 > 20031214_000043.exv   Exif.CanonSi.0x0006                          Short       1  0
diff --git a/test/path-test.sh b/test/path-test.sh
index a7386d6..be00992 100755
--- a/test/path-test.sh
+++ b/test/path-test.sh
@@ -9,7 +9,7 @@ else
 fi
 cd ./tmp
 
-if { test -f "$bin/path-test" || test -f "$bin/path-test.exe"; }; then
+if { test -f $bin/path-test || test -f $bin/path-test.exe; }; then
     $bin/path-test ../data/path-test.txt
 else
     echo "path-test.sh: path-test executable not found. Skipping path tests."

-- 
exiv2 packaging