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

The following commit has been merged in the master branch:
commit db3af9720aaa9b85f339ce436b0357fefb0d367f
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sun Oct 30 02:42:02 2016 +0000

    Update various lists to match ExifTool version 10.31.
---
 src/canonmn.cpp   | 1 +
 src/minoltamn.cpp | 4 +++-
 src/sonymn.cpp    | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 4f25a91..2d45d8b 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -800,6 +800,7 @@ namespace Exiv2 {
         {  52, "Canon EF-S 18-55mm f/3.5-5.6 IS II"                         },
         {  53, "Canon EF-S 18-55mm f/3.5-5.6 III"                           },
         {  54, "Canon EF-S 55-250mm f/4-5.6 IS II"                          },
+        {  60, "Irix 11mm f/4"                                              },
         {  94, "Canon TS-E 17mm f/4L"                                       },
         {  95, "Canon TS-E 24.0mm f/3.5 L II"                               },
         { 124, "Canon MP-E 65mm f/2.8 1-5x Macro Photo"                     },
diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 5f7d0fb..c02548f 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -1752,8 +1752,10 @@ namespace Exiv2 {
         { 194,   "Tamron SP AF 17-50mm F2.8 XR Di II LD Aspherical [IF]" },
         { 203,   "Tamron SP 70-200mm F2.8 Di USD" },
         { 204,   "Tamron SP 24-70mm F2.8 Di USD" },
-        { 213,   "Tamron 16-300mm F3.5-6.3 Di II PZD" },
+        { 212,   "Tamron 28-300mm F3.5-6.3 Di PZD" },
+        { 213,   "Tamron 16-300mm F3.5-6.3 Di II PZD Macro" },
         { 214,   "Tamron Tamron SP 150-600mm F5-6.3 Di USD" },
+        { 215,   "Tamron SP 15-30mm F2.8 Di USD" },
         { 224,   "Tamron SP 90mm F2.8 Di Macro 1:1 USD" },
         {0xff,   "Tamron SP AF 17-50mm F2.8 XR Di II LD Aspherical | "                   // 1
                  "Tamron AF 18-250mm F3.5-6.3 XR Di II LD | "                            // 2
diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index 0a29eb7..a9ff510 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -129,6 +129,7 @@ namespace Exiv2 {
         { 353, "ICLA-68"                },
         { 354, "ILCA-99M2"              },
         { 355, "DSC-RX10M3"             },
+        { 356, "DSC-RX100M5"            },
         { 357, "ILCE-6300"              }
     };
 

-- 
exiv2 packaging