[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=1a0095f

The following commit has been merged in the master branch:
commit 1a0095ff4a58bca6e6bbbd5bb2b16cdc15775556
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Nov 13 11:51:54 2016 +0000

    #1252  Patch submitted.  Thank You to Markus for the patch and test files.  Test suite updated appropriately.
---
 src/canonmn.cpp              |   1 +
 test/bugfixes-test.sh        |   8 ++++++++
 test/data/bugfixes-test.out  | Bin 1928430 -> 1929443 bytes
 test/data/exiv2-bug1252a.exv | Bin 0 -> 24437 bytes
 test/data/exiv2-bug1252b.exv | Bin 0 -> 24065 bytes
 5 files changed, 9 insertions(+)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 2d45d8b..c0887d1 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -917,6 +917,7 @@ namespace Exiv2 {
         { 174, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM"                     }, // 2
         { 174, "Sigma 150-500mm f/5-6.3 APO DG OS HSM"                      }, // 3
         { 174, "Zeiss Milvus 100mm f/2 Makro"                               }, // 4
+        { 174, "Sigma 120-300mm f/2.8 EX APO DG OS HSM"                     }, // 5
         { 175, "Canon EF 400mm f/2.8L"                                      },
         { 176, "Canon EF 24-85mm f/3.5-4.5 USM"                             },
         { 177, "Canon EF 300mm f/4L IS"                                     },
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index 8a76b4d..a8e8cc5 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -613,6 +613,14 @@ source ./functions.source
     copyTestFile                        $filename
     runTest exiv2 -pa                   $filename
 
+    num=1252
+    for X in a b; do
+      filename=exiv2-bug$num$X.exv
+      echo '------>' Bug $filename '<-------' >&2
+      copyTestFile                      $filename
+      runTest exiv2 -pa --grep lens/i   $filename
+    done
+
 ) 3>&1 > $results 2>&1
 
 printf "
"
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index f502286..c496692 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ
diff --git a/test/data/exiv2-bug1252a.exv b/test/data/exiv2-bug1252a.exv
new file mode 100644
index 0000000..8fd233a
Binary files /dev/null and b/test/data/exiv2-bug1252a.exv differ
diff --git a/test/data/exiv2-bug1252b.exv b/test/data/exiv2-bug1252b.exv
new file mode 100644
index 0000000..c05390f
Binary files /dev/null and b/test/data/exiv2-bug1252b.exv differ

-- 
exiv2 packaging