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

The following commit has been merged in the master branch:
commit ade1ff2a5d5912182024e161bada77b25d448339
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sat Nov 9 03:54:00 2013 +0000

    Update lens lists to match ExifTool version 9.40.
---
 src/canonmn.cpp  | 3 ++-
 src/nikonmn.cpp  | 1 +
 src/pentaxmn.cpp | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 3d6ba9c..de296d4 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -780,7 +780,8 @@ namespace Exiv2 {
         { 195, "Canon EF 35-105mm f/4.5-5.6 USM"                            },
         { 196, "Canon EF 75-300mm f/4-5.6 USM"                              },
         { 197, "Canon EF 75-300mm f/4-5.6 IS USM"                           },
-        { 198, "Canon EF 50mm f/1.4 USM"                                    },
+        { 198, "Canon EF 50mm f/1.4 USM"                                    }, // 0
+        { 198, "Zeiss Otus 55mm f/1.4 ZE"                                   }, // 1
         { 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/nikonmn.cpp b/src/nikonmn.cpp
index 8893826..81d3c0f 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -1956,6 +1956,7 @@ fmountlens[] = {
 {0x9D,0x00,0x62,0x62,0x24,0x24,0x9F,0x06,0x40,0x00,0x00, "Nikon", "JAA634DA", "PC-E Micro Nikkor 85mm f/2.8D"},
 {0x9E,0x40,0x2D,0x6A,0x2C,0x3C,0xA0,0x0E,0x01,0x00,0x00, "Nikon", "JAA805DA", "AF-S DX VR Zoom-Nikkor 18-105mm f/3.5-5.6G ED"},
 {0x9F,0x58,0x44,0x44,0x14,0x14,0xA1,0x06,0x01,0x00,0x00, "Nikon", "JAA132DA", "AF-S DX Nikkor 35mm f/1.8G"},
+{0xA0,0x40,0x2D,0x74,0x2C,0x3C,0xBB,0x0E,0x01,0x00,0x00, "Nikon", "", "AF-S DX Nikkor 18-140mm f/3.5-5.6G ED VR"},
 {0xA0,0x54,0x50,0x50,0x0C,0x0C,0xA2,0x06,0x01,0x00,0x00, "Nikon", "JAA014DA", "AF-S Nikkor 50mm f/1.4G"},
 {0xA1,0x40,0x18,0x37,0x2C,0x34,0xA3,0x06,0x01,0x00,0x00, "Nikon", "JAA804DA", "AF-S DX Nikkor 10-24mm f/3.5-4.5G ED"},
 {0xA2,0x48,0x5C,0x80,0x24,0x24,0xA4,0x0E,0x13,0x00,0x00, "Nikon", "JAA807DA", "AF-S Nikkor 70-200mm f/2.8G ED VR II"},
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index c58266a..8cf0937 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -930,6 +930,7 @@ namespace Exiv2 {
         { 0x1605, "05 Toy Lens Telephoto 18mm F8" },
         { 0x1506, "06 Telephoto Zoom 15-45mm F2.8" },
         { 0x1507, "07 Mount Shield 11.5mm F9" },
+        { 0x1508, "08 Wide Zoom 3.8-5.9mm F3.7-4" },
     };
 
     //! ImageTone, tag 0x004f

-- 
exiv2 packaging