[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=40dbbf6

The following commit has been merged in the master branch:
commit 40dbbf63734ee2fd079a56a0a9a1df7df7068540
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sat Feb 25 04:45:19 2017 +0000

    Update various lists to match ExifTool version 10.44.
---
 src/canonmn.cpp   | 7 ++++++-
 src/minoltamn.cpp | 1 +
 src/nikonmn.cpp   | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index a863f3b..eb5ec17 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -299,6 +299,8 @@ namespace Exiv2 {
         { (long int)0x4040001, "IXY 180" },
         { (long int)0x4050000, "PowerShot SX720 HS" },
         { (long int)0x4060000, "PowerShot SX620 HS" },
+        { (long int)0x4070000, "EOS M6" },
+        { (long int)0x4100000, "PowerShot G9 X Mark II" },
         { (long int)0x6040000, "PowerShot S100 / Digital IXUS / IXY Digital" },
         { (long int)0x4007d673, "DC19/DC21/DC22" },
         { (long int)0x4007d674, "XH A1" },
@@ -382,7 +384,9 @@ namespace Exiv2 {
         { (long int)0x80000382, "EOS 5DS" },
         { (long int)0x80000393, "EOS Rebel T6i / 750D / Kiss X8i" },
         { (long int)0x80000401, "EOS 5DS R" },
-        { (long int)0x80000404, "EOS Rebel T6 / 1300D / Kiss X80" }
+        { (long int)0x80000404, "EOS Rebel T6 / 1300D / Kiss X80" },
+        { (long int)0x80000405, "EOS Rebel T7i / 800D / Kiss X9i" },
+        { (long int)0x80000408, "EOS 77D / 9000D" }
     };
 
     //! SerialNumberFormat, tag 0x0015
@@ -1050,6 +1054,7 @@ namespace Exiv2 {
         { 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"                       },
+        { 4158,"Canon EF-S 18-55mm f/4-5.6 IS STM"                          },
         {36910,"Canon EF 70-300mm f/4-5.6 IS II USM"                        },
         {36912,"Canon EF-S 18-135mm f/3.5-5.6 IS USM"                       },
         {65535,"n/a"                                                        }
diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index ca8568b9..0b074b8 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -1757,6 +1757,7 @@ namespace Exiv2 {
         { 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" },
+        { 218,   "Tamron SP 90mm F2.8 Di Macro 1:1 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/nikonmn.cpp b/src/nikonmn.cpp
index 545f3ca..8499af0 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -2106,6 +2106,7 @@ fmountlens[] = {
 {0x91,0x54,0x44,0x44,0x0C,0x0C,0x4B,0x06,0x01,0x00,0x00, "Sigma", "", "35mm F1.4 DG HSM"},
 {0xDE,0x54,0x50,0x50,0x0C,0x0C,0x4B,0x06,0x01,0x00,0x00, "Sigma", "310554", "50mm F1.4 EX DG HSM"},
 {0x88,0x54,0x50,0x50,0x0C,0x0C,0x4B,0x06,0x00,0x00,0x00, "Sigma", "", "50mm F1.4 DG HSM | A"},
+{0x79,0x54,0x31,0x31,0x0C,0x0C,0x4B,0x06,0x00,0x00,0x00, "Sigma", "", "20mm F1.4 DG HSM | A"},
 {0x02,0x48,0x50,0x50,0x24,0x24,0x02,0x00,0x00,0x00,0x00, "Sigma", "", "Macro 50mm F2.8"},
 {0x32,0x54,0x50,0x50,0x24,0x24,0x35,0x02,0x00,0x00,0x00, "Sigma", "346447", "Macro 50mm F2.8 EX DG"},
 {0xE3,0x54,0x50,0x50,0x24,0x24,0x35,0x02,0x00,0x00,0x00, "Sigma", "", "Macro 50mm F2.8 EX DG"},
@@ -2256,6 +2257,7 @@ fmountlens[] = {
 {0xF8,0x55,0x64,0x64,0x24,0x24,0x84,0x06,0x41,0x00,0x00, "Tamron", "272NII", "SP AF 90mm F/2.8 Di Macro 1:1"},
 {0xF8,0x54,0x64,0x64,0x24,0x24,0xDF,0x06,0x41,0x00,0x00, "Tamron", "272NII", "SP AF 90mm F/2.8 Di Macro 1:1"},
 {0xFE,0x54,0x64,0x64,0x24,0x24,0xDF,0x0E,0x00,0x00,0x00, "Tamron", "F004", "SP 90mm F/2.8 Di VC USD MACRO 1:1"},
+{0xE4,0x54,0x64,0x64,0x24,0x24,0xDF,0x0E,0x00,0x00,0x00, "Tamron", "F007", "SP 90mm F/2.8 Di VC USD MACRO 1:1"},
 {0x00,0x4C,0x7C,0x7C,0x2C,0x2C,0x00,0x02,0x00,0x00,0x00, "Tamron", "B01", "SP AF 180mm F/3.5 Di Model"},
 {0x21,0x56,0x8E,0x8E,0x24,0x24,0x14,0x00,0x00,0x00,0x00, "Tamron", "60E", "SP AF 300mm F/2.8 LD-IF"},
 {0x27,0x54,0x8E,0x8E,0x24,0x24,0x1D,0x02,0x00,0x00,0x00, "Tamron", "360E", "SP AF 300mm F/2.8 LD-IF"},

-- 
exiv2 packaging