[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=60b0b84

The following commit has been merged in the master branch:
commit 60b0b842cf1654cf8e8ed0579ce017a3290f90e6
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Mar 22 15:03:34 2016 +0000

    #1170.  Thank you, Marcus for reporting this and providing the test data.
---
 src/canonmn.cpp             |   2 +-
 test/bugfixes-test.sh       |   7 +++++++
 test/data/bugfixes-test.out | Bin 1871756 -> 1872213 bytes
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 70369d3..962ce7b 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -995,7 +995,7 @@ namespace Exiv2 {
         { 160, printCsLensByFocalLength },
         { 161, printCsLensByFocalLength },
         { 168, printCsLensByFocalLength },
-        { 169, printCsLensByFocalLength },
+        { 169, printCsLensByFocalLengthAndMaxAperture },
         { 172, printCsLensByFocalLength }, // not tested
         { 173, printCsLensByFocalLengthTC }, // works partly
         { 174, printCsLensByFocalLength }, // not tested
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index a9a9788..2917988 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -527,6 +527,13 @@ source ./functions.source
 	copyTestFile                        $filename
 	runTest exiv2 -pa --grep lens/i     $filename
 
+	num=1170
+	printf "$num " >&3
+	filename=exiv2-bug$num.exv
+	echo '------>' Bug $num '<-------' >&2
+	copyTestFile                        $filename
+	runTest exiv2 -pa --grep lens/i     $filename
+
 ) 3>&1 > $results 2>&1
 
 printf "
"
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index a7a6340..6df659b 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ

-- 
exiv2 packaging