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

The following commit has been merged in the master branch:
commit f260b163adf5384d3e817145c7875fbfea16643e
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sat Sep 17 01:55:10 2016 +0000

    Update Canon and Nikon lens lists to match ExifTool version 10.26.
---
 src/canonmn.cpp | 4 ++++
 src/nikonmn.cpp | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 470f247..3701b31 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -297,6 +297,7 @@ namespace Exiv2 {
         { (long int)0x4040000, "PowerShot G1" },
         { (long int)0x4040001, "IXY 180" },
         { (long int)0x4050000, "PowerShot SX720 HS" },
+        { (long int)0x4060000, "PowerShot SX620 HS" },
         { (long int)0x6040000, "PowerShot S100 / Digital IXUS / IXY Digital" },
         { (long int)0x4007d673, "DC19/DC21/DC22" },
         { (long int)0x4007d674, "XH A1" },
@@ -376,6 +377,7 @@ namespace Exiv2 {
         { (long int)0x80000355, "EOS M2" },
         { (long int)0x80000346, "EOS Rebel SL1 / 100D / Kiss X7" },
         { (long int)0x80000347, "EOS Rebel T6s / 760D / 8000D" },
+        { (long int)0x80000349, "EOS 5D Mark IV" },
         { (long int)0x80000382, "EOS 5DS" },
         { (long int)0x80000393, "EOS Rebel T6i / 750D / Kiss X8i" },
         { (long int)0x80000401, "EOS 5DS R" },
@@ -1009,6 +1011,8 @@ namespace Exiv2 {
         { 747, "Canon EF 100-400mm f/4.5-5.6L IS II USM"                    },
         { 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"                            },
+        { 752, "Canon EF 24-105mm f/4L IS II USM"                           },
         { 4142,"Canon EF-S 18-135mm f/3.5-5.6 IS STM"                       },
         { 4143,"Canon EF-M 18-55mm f/3.5-5.6 IS STM"                        }, // 0
         { 4143,"Tamron 18-200mm F/3.5-6.3 Di III VC"                        }, // 1
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 516907e..a434849 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -2076,6 +2076,7 @@ fmountlens[] = {
 //
 //
 {0xA5,0x54,0x6A,0x6A,0x0C,0x0C,0xD0,0x46,0x01,0x00,0x03, "Nikon", "JAA343DA", "AF-S Nikkor 105mm f/1.4E ED"},
+{0xA5,0x54,0x6A,0x6A,0x0C,0x0C,0xD0,0x06,0x01,0x00,0x03, "Nikon", "JAA343DA", "AF-S Nikkor 105mm f/1.4E ED"},
 //
 //
 {0x01,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00, "Nikon", "JAA90701", "TC-16A"},

-- 
exiv2 packaging