[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=581c1b3

The following commit has been merged in the master branch:
commit 581c1b3145977f2c85e1191472c2ea8a251bf6a9
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sat Mar 14 12:46:14 2015 +0000

    Update lens lists to match ExifTool version 9.90.
---
 src/minoltamn.cpp | 6 ++++--
 src/nikonmn.cpp   | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 04066e0..d52b729 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -1764,10 +1764,11 @@ namespace Exiv2 {
                  "Tokina 28-70mm F2.8 AT-X | "
                  "Tokina 80-400mm F4.5-5.6 AT-X AF II 840 | "
                  "Tokina AF PRO 28-80mm F2.8 AT-X 280 | "
-                 "Tokina AT-X PRO II AF 28-70mm F2.6-2.8 270 | "
+                 "Tokina AT-X PRO [II] AF 28-70mm F2.6-2.8 270 | "
                  "Tamron AF 19-35mm F3.5-4.5 | "
                  "Angenieux AF 28-70mm F2.6 | "
-                 "Tokina AT-X 17 AF 17mm F3.5" },
+                 "Tokina AT-X 17 AF 17mm F3.5 | "
+                 "Tokina 20-35mm F3.5-4.5 II AF" },
         { 25530, "Minolta AF 28-135mm F4-4.5" },
         { 25531, "Minolta AF 28-135mm F4-4.5 | "
                  "Sigma ZOOM-alpha 35-135mm F3.5-4.5 | "
@@ -1905,6 +1906,7 @@ namespace Exiv2 {
         { 26681, "Minolta AF 28mm F2 New" },
         { 26721, "Minolta AF 24-105mm F3.5-4.5 (D)" },
         { 45671, "Tokina 70-210mm F4-5.6" },
+        { 45711, "Vivitar 70-210mm F4.5-5.6" },
         { 45741, "Minolta AF200mm F2.8G x2 | "
                  "Tokina 300mm F2.8 x2 | "
                  "Tokina RF 500mm F8.0 x2 | "
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 6d25667..f418095 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -1992,6 +1992,7 @@ fmountlens[] = {
 {0xA5,0x40,0x3C,0x8E,0x2C,0x3C,0xA7,0x0E,0x01,0x00,0x00, "Nikon", "JAA808DA", "AF-S Nikkor 28-300mm f/3.5-5.6G ED VR"},
 {0xA6,0x48,0x8E,0x8E,0x24,0x24,0xA8,0x0E,0x13,0x00,0x00, "Nikon", "JAA339DA", "AF-S Nikkor 300mm f/2.8G IF-ED VR II"},
 {0xA7,0x4B,0x62,0x62,0x2C,0x2C,0xA9,0x0E,0x41,0x00,0x00, "Nikon", "JAA637DA", "AF-S DX Micro Nikkor 85mm f/3.5G ED VR"},
+{0xA7,0x3C,0x53,0x80,0x30,0x3C,0xC2,0x0E,0x01,0x00,0x00, "Nikon", "", "AF-S DX Nikkor 55-200mm f/4-5.6G ED VR II"},
 {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"},
 {0xAA,0x3C,0x37,0x6E,0x30,0x30,0xAC,0x0E,0x01,0x00,0x00, "Nikon", "JAA811DA", "AF-S Nikkor 24-120mm f/4G ED VR"},

-- 
exiv2 packaging