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

The following commit has been merged in the master branch:
commit ac5892f2c696a0ef66f7295b96d1dbb2fa37f526
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Thu Oct 16 16:17:40 2014 +0000

    Update lens lists to match ExifTool version 9.74.
---
 src/canonmn.cpp   | 2 ++
 src/minoltamn.cpp | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 1cfabd1..1778376 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -651,6 +651,7 @@ namespace Exiv2 {
         {  33, "Carl Zeiss Distagon 28mm T* f/2 ZE"                         }, // 7
         {  33, "Carl Zeiss Distagon 35mm T* f/2 ZE"                         }, // 8
         {  33, "Carl Zeiss Planar 50mm T* f/1.4 ZE"                         }, // 9
+        {  33, "Carl Zeiss Apo-Sonnar T* 135mm f/2 ZE"                      }, // 10
         {  35, "Canon EF 35-80mm f/4-5.6"                                   },
         {  36, "Canon EF 38-76mm f/4.5-5.6"                                 },
         {  37, "Canon EF 35-80mm f/4-5.6"                                   }, // 0
@@ -808,6 +809,7 @@ namespace Exiv2 {
         { 197, "Canon EF 75-300mm f/4-5.6 IS USM"                           },
         { 198, "Canon EF 50mm f/1.4 USM"                                    }, // 0
         { 198, "Zeiss Otus 55mm f/1.4 ZE"                                   }, // 1
+        { 198, "Zeiss Otus 85mm f/1.4 ZE"                                   }, // 2
         { 199, "Canon EF 28-80mm f/3.5-5.6 USM"                             },
         { 200, "Canon EF 75-300mm f/4-5.6 USM"                              },
         { 201, "Canon EF 28-80mm f/3.5-5.6 USM"                             },
diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 87b40b4..f31d49a 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -1734,6 +1734,7 @@ namespace Exiv2 {
         { 193,   "Minolta AF 1.4x APO II" },
         { 194,   "Tamron SP AF 17-50mm F2.8 XR Di II LD Aspherical [IF]" },
         { 203,   "Tamron SP 70-200mm F2.8 Di USD" },
+        { 214,   "Tamron Tamron SP 150-600mm F5-6.3 Di USD" },
         { 255,   "Tamron SP AF 17-50mm F2.8 XR Di II LD Aspherical | "
                  "Tamron AF 18-250mm F3.5-6.3 XR Di II LD | "
                  "Tamron AF 55-200mm F4-5.6 Di II LD Macro | "

-- 
exiv2 packaging