[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=18b1923

The following commit has been merged in the master branch:
commit 18b1923973a8b7640f71e5928f9bb68ec0e19b5a
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sun Feb 15 03:12:45 2015 +0000

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

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 1ba4c70..3083e58 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -873,7 +873,8 @@ namespace Exiv2 {
         { 252, "Canon EF 70-200mm f/2.8L IS II USM + 1.4x"                  },
         { 253, "Canon EF 70-200mm f/2.8L IS II USM + 2x"                    },
         { 254, "Canon EF 100mm f/2.8L Macro IS USM"                         },
-        { 255, "Sigma 24-105mm f/4 DG OS HSM | A"                           },
+        { 255, "Sigma 24-105mm f/4 DG OS HSM | A"                           }, // 0
+        { 255, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro"                   }, // 1
         { 488, "Canon EF-S 15-85mm f/3.5-5.6 IS USM"                        },
         { 489, "Canon EF 70-300mm f/4-5.6L IS USM"                          },
         { 490, "Canon EF 8-15mm f/4L USM"                                   },
@@ -944,6 +945,7 @@ namespace Exiv2 {
         { 198, printCsLensByFocalLength }, // not tested
         { 213, printCsLensByFocalLength }, // not tested
         { 234, printCsLensByFocalLength }, // not tested
+        { 255, printCsLensByFocalLength }, // not tested
         { 4143,printCsLensByFocalLength }  // not tested
     };
 
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 5028158..322464f 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -1995,8 +1995,8 @@ fmountlens[] = {
 {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"},
 //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"},
-{0xAD,0x3C,0x2D,0x8E,0x2C,0x3C,0xAF,0x0E,0x01,0x00,0x00, "Nikon", "JAA812DA", "AF-S DX Nikkor 18-300mm 3.5-5.6G ED VR"},
+{0xAC,0x38,0x53,0x8E,0x34,0x3C,0xAE,0x0E,0x01,0x00,0x00, "Nikon", "JAA814DA", "AF-S DX Nikkor f/55-300mm 4.5-5.6G ED VR"},
+{0xAD,0x3C,0x2D,0x8E,0x2C,0x3C,0xAF,0x0E,0x01,0x00,0x00, "Nikon", "JAA812DA", "AF-S DX Nikkor f/18-300mm 3.5-5.6G ED VR"},
 {0xAE,0x54,0x62,0x62,0x0C,0x0C,0xB0,0x06,0x01,0x00,0x00, "Nikon", "JAA338DA", "AF-S Nikkor 85mm f/1.4G"},
 {0xAF,0x54,0x44,0x44,0x0C,0x0C,0xB1,0x06,0x01,0x00,0x00, "Nikon", "JAA134DA", "AF-S Nikkor 35mm f/1.4G"},
 {0xB0,0x4C,0x50,0x50,0x14,0x14,0xB2,0x06,0x01,0x00,0x00, "Nikon", "JAA015DA", "AF-S Nikkor 50mm f/1.8G"},
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index 02d0883..edc9b48 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -909,6 +909,9 @@ namespace Exiv2 {
         { 0x081f, "Sigma 18-35mm F1.8 DC HSM" },
         { 0x0820, "Sigma 30mm F1.4 DC HSM | A" },
         { 0x083b, "HD PENTAX-D FA 150-450mm F4.5-5.6 ED DC AW" },
+        { 0x083c, "HD PENTAX-D FA* 70-200mm F2.8 ED DC AW" },
+        { 0x08c6, "smc PENTAX-DA L 18-50mm F4-5.6 DC WR RE" },
+        { 0x08c7, "HD PENTAX-DA 18-50mm F4-5.6 DC WR RE" },
         { 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" },

-- 
exiv2 packaging