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

The following commit has been merged in the master branch:
commit bc2f4174201227b9fd266b6c1ede82a1dede8dee
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Wed Nov 5 17:25:04 2014 +0000

    Update lens lists to match ExifTool version 9.75.
---
 src/minoltamn.cpp | 2 ++
 src/nikonmn.cpp   | 1 +
 src/pentaxmn.cpp  | 1 +
 src/samsungmn.cpp | 1 +
 4 files changed, 5 insertions(+)

diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index f31d49a..bd06063 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -1734,7 +1734,9 @@ 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" },
+        { 204,   "Tamron SP 24-70mm F2.8 Di USD" },
         { 214,   "Tamron Tamron SP 150-600mm F5-6.3 Di USD" },
+        { 224,   "Tamron SP 90mm F2.8 Di Macro 1:1 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 | "
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index aecc90a..3cf8b0a 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -1991,6 +1991,7 @@ fmountlens[] = {
 {0xA7,0x4B,0x62,0x62,0x2C,0x2C,0xA9,0x0E,0x41,0x00,0x00, "Nikon", "JAA637DA", "AF-S DX Micro Nikkor 85mm f/3.5G ED VR"},
 {0xA8,0x48,0x80,0x98,0x30,0x30,0xAA,0x0E,0x03,0x00,0x00, "Nikon", "JAA809DA", "AF-S Zoom-Nikkor 200-400mm f/4G IF-ED VR II"},
 {0xA9,0x54,0x80,0x80,0x18,0x18,0xAB,0x0E,0x13,0x00,0x00, "Nikon", "JAA340DA", "AF-S Nikkor 200mm f/2G ED VR II"},
+{0xA9,0x4C,0x31,0x31,0x14,0x14,0xC4,0x06,0x01,0x00,0x00, "Nikon", "", "AF-S Nikkor 20mm f/1.8G ED"},
 {0xAA,0x3C,0x37,0x6E,0x30,0x30,0xAC,0x0E,0x01,0x00,0x00, "Nikon", "JAA811DA", "AF-S Nikkor 24-120mm f/4G ED VR"},
 //AB                AD                                          -- no lens --
 {0xAC,0x38,0x53,0x8E,0x34,0x3C,0xAE,0x0E,0x01,0x00,0x00, "Nikon", "JAA814DA", "AF-S DX Nikkor 55-300mm 4.5-5.6G ED VR"},
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index 95ef47a..0ab0f45 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -905,6 +905,7 @@ namespace Exiv2 {
         { 0x081e, "Sigma 17-70mm F2.8-4 DC Macro HSM Contemporary" },
         { 0x081f, "Sigma 18-35mm F1.8 DC HSM" },
         { 0x0820, "Sigma 30mm F1.4 DC HSM | A" },
+        { 0x08c8, "HD PENTAX-DA 16-85mm F3.5-5.6 ED DC WR" },
         { 0x08d1, "HD PENTAX-DA 20-40mm F2.8-4 ED Limited DC WR" },
         { 0x08d2, "smc PENTAX-DA 18-270mm F3.5-6.3 ED SDM" },
         { 0x08d3, "HD PENTAX-DA 560mm F5.6 ED AW" },
diff --git a/src/samsungmn.cpp b/src/samsungmn.cpp
index 6de0df1..ea9e13d 100644
--- a/src/samsungmn.cpp
+++ b/src/samsungmn.cpp
@@ -63,6 +63,7 @@ namespace Exiv2 {
         { 10, N_("Samsung NX 45mm F1.8")                  },
         { 11, N_("Samsung NX 45mm F1.8 2D/3D")            },
         { 12, N_("Samsung NX 12-24mm F4-5.6 ED")          },
+        { 13, N_("Saumsun NX 16-50mm F2-2.8 S ED OIS")    },
         { 14, N_("Samsung NX 10mm F3.5 Fisheye")          },
         { 15, N_("Samsung NX 16-50mm F3.5-5.6 PZ ED OIS") },
         { 20, N_("Samsung NX 50-150mm F2.8 S ED OIS")     }

-- 
exiv2 packaging