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

The following commit has been merged in the master branch:
commit e8c2c7ba015d072f2d889205da74399eef059841
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Thu Mar 23 03:51:21 2017 +0000

    Update various lists to match ExifTool version 10.47.
---
 src/minoltamn.cpp |  5 +++--
 src/pentaxmn.cpp  | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index e4d00b1..febb671 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -1751,14 +1751,15 @@ namespace Exiv2 {
         { 146,   "Voigtlander Macro APO-Lanthar 125mm F2.5 SL" },
         { 193,   "Minolta AF 1.4x APO II" },
         { 194,   "Tamron SP AF 17-50mm F2.8 XR Di II LD Aspherical [IF]" },
+        { 202,   "Tamron SP AF 70-200mm F2.8 Di LD [IF] Macro" },
         { 203,   "Tamron SP 70-200mm F2.8 Di USD" },
         { 204,   "Tamron SP 24-70mm F2.8 Di USD" },
         { 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" },
-        { 218,   "Tamron SP 90mm F2.8 Di Macro 1:1 USD" },
-        { 224,   "Tamron SP 90mm F2.8 Di Macro 1:1 USD" },
+        { 218,   "Tamron SP 90mm F2.8 Di Macro 1:1 USD (F017)" },
+        { 224,   "Tamron SP 90mm F2.8 Di Macro 1:1 USD (F004)" },
         {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
                  "Tamron AF 55-200mm F4-5.6 Di II LD Macro | "                           // 3
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index a5e4e19..4fc38be 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -352,6 +352,12 @@ namespace Exiv2 {
         {    37, "128000" },
         {    38, "160000" },
         {    39, "204800" },
+        {    40, "256000" },
+        {    41, "320000" },
+        {    42, "409600" },
+        {    43, "512000" },
+        {    44, "640000" },
+        {    45, "819200" },
         {    50, "50" },
         {    100, "100" },
         {    200, "200" },
@@ -381,7 +387,14 @@ namespace Exiv2 {
         {    276, "25600" },
         {    277, "36000" },
         {    278, "51200" },
-
+        {    279, "72000" },
+        {    280, "102400" },
+        {    281, "144000" },
+        {    282, "204800" },
+        {    283, "288000" },
+        {    284, "409600" },
+        {    285, "576000" },
+        {    286, "819200" },
     };
 
     //! Generic for Off/On switches

-- 
exiv2 packaging