[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=133174a

The following commit has been merged in the master branch:
commit 133174a6b15153e99e74ab032f9673e6e7803605
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Thu Sep 29 03:37:38 2016 +0000

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

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 80ab672..4f25a91 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -1025,7 +1025,8 @@ namespace Exiv2 {
         { 506, "Canon EF 400mm f/4 DO IS II USM"                            },
         { 507, "Canon EF 16-35mm f/4L IS USM"                               },
         { 508, "Canon EF 11-24mm f/4L USM"                                  },
-        { 747, "Canon EF 100-400mm f/4.5-5.6L IS II USM"                    },
+        { 747, "Canon EF 100-400mm f/4.5-5.6L IS II USM"                    }, // 0
+        { 747, "Tamron SP 150-600mm F5-6.3 Di VC USD G2"                    }, // 1
         { 748, "Canon EF 100-400mm f/4.5-5.6L IS II USM + 1.4x"             },
         { 750, "Canon EF 35mm f/1.4L II USM"                                },
         { 751, "Canon EF 16-35mm f/2.8L III USM"                            },
@@ -1045,6 +1046,7 @@ namespace Exiv2 {
         { 4154,"Canon EF-S 24mm f/2.8 STM"                                  },
         { 4155,"Canon EF-M 28mm f/3.5 Macro IS STM"                         },
         { 4156,"Canon EF 50mm f/1.8 STM"                                    },
+        { 4157,"Canon EF-M 18-150mm 1:3.5-6.3 IS STM"                       },
         {36912,"Canon EF-S 18-135mm f/3.5-5.6 IS USM"                       },
         {65535,"n/a"                                                        }
     };
@@ -1099,6 +1101,7 @@ namespace Exiv2 {
         { 250, printCsLensByFocalLength }, // not tested
         { 255, printCsLensByFocalLength }, // not tested
         { 493, printCsLensByFocalLength }, // not tested
+        { 747, printCsLensByFocalLength }, // not tested
         { 4143,printCsLensByFocalLength }, // not tested
         { 4154,printCsLensByFocalLength }, // not tested
        {0xffff,printCsLensFFFF          }
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index c427d0d..d4f6378 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -768,6 +768,7 @@ namespace Exiv2 {
         { 0x0402, "smc PENTAX-FA 80-320mm F4.5-5.6" },
         { 0x0403, "smc PENTAX-FA 43mm F1.9 Limited" },
         { 0x0406, "smc PENTAX-FA 35-80mm F4-5.6" },
+        { 0x040a, "Irix 15mm F2.4" },
         { 0x040c, "smc PENTAX-FA 50mm F1.4" },
         { 0x040f, "smc PENTAX-FA 28-105mm F4-5.6 [IF]" },
         { 0x0410, "Tamron AF 80-210mm F4-5.6 (178D)" },
diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index 3d4c606..0a29eb7 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -127,6 +127,7 @@ namespace Exiv2 {
         { 347, "ILCE-7RM2"              },
         { 350, "ILCE-7SM2"              },
         { 353, "ICLA-68"                },
+        { 354, "ILCA-99M2"              },
         { 355, "DSC-RX10M3"             },
         { 357, "ILCE-6300"              }
     };

-- 
exiv2 packaging