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

The following commit has been merged in the master branch:
commit cc0ec825ec0ed977837e8b59f1a5b96276ba14f4
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Mar 4 08:33:08 2016 +0000

    #1166.  Thank You, Phillippe for reporting this and providing a patch and test data.
---
 src/canonmn.cpp             |   1 +
 test/bugfixes-test.sh       |   7 +++++++
 test/data/bugfixes-test.out | Bin 1857030 -> 1857523 bytes
 test/data/exiv2-bug1166.exv | Bin 0 -> 24007 bytes
 4 files changed, 8 insertions(+)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index e186864..f7b5ffe 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -785,6 +785,7 @@ namespace Exiv2 {
         { 160, "Tokina AT-X 124 AF 12-24mm f/4 DX"                          }, // 2
         { 160, "Tokina AT-X 107 AF DX Fish-eye 10-17mm f/3.5-4.5"           }, // 3
         { 160, "Tokina AT-X 116 PRO DX AF 11-16mm f/2.8"                    }, // 4
+        { 160, "Tokina AT-X 11 PRO DX Aspherical 11-20mm f/2.8"             }, // 5
         { 161, "Canon EF 28-70mm f/2.8L"                                    }, // 0
         { 161, "Sigma 24-70mm EX f/2.8"                                     }, // 1
         { 161, "Sigma 28-70mm f/2.8 EX"                                     }, // 2
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index 954e6d5..99e19fa 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -500,6 +500,13 @@ source ./functions.source
 	  runTest exiv2 -pa -g Lens         $filename
 	done
 
+	num=1166
+	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 7f5525e..602ecc1 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ
diff --git a/test/data/exiv2-bug1166.exv b/test/data/exiv2-bug1166.exv
new file mode 100644
index 0000000..2b196d1
Binary files /dev/null and b/test/data/exiv2-bug1166.exv differ

-- 
exiv2 packaging