[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=1ef6ff9

The following commit has been merged in the master branch:
commit 1ef6ff94b00ef5d58dbc37d66e45b435cbea13f1
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Mon Jan 25 03:26:20 2016 +0000

    Update various lists to match ExifTool version 10.10.
---
 src/nikonmn.cpp   | 1 +
 src/olympusmn.cpp | 4 +++-
 src/pentaxmn.cpp  | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 8de3ff9..6c5d1de 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -2020,6 +2020,7 @@ fmountlens[] = {
 {0xA8,0x48,0x8E,0x8E,0x30,0x30,0xC3,0x0E,0x01,0x00,0x01, "Nikon", "JAA342DA", "AF-S Nikkor 300mm f/4E PF ED VR"},
 {0xA9,0x4C,0x31,0x31,0x14,0x14,0xC4,0x06,0x01,0x00,0x01, "Nikon", "JAA138DA", "AF-S Nikkor 20mm f/1.8G ED"},
 {0xAA,0x48,0x37,0x5C,0x24,0x24,0xC5,0x4E,0x01,0x00,0x02, "Nikon", "JAA824DA", "AF-S Nikkor 24-70mm f/2.8E ED VR"},
+{0xAC,0x3C,0xA6,0xA6,0x30,0x30,0xC7,0x4E,0x01,0x00,0x02, "Nikon", "", "AF-S Nikkor 600mm f/4E FL ED VR"},
 {0xAD,0x48,0x28,0x60,0x24,0x30,0xC8,0x4E,0x01,0x00,0x02, "Nikon", "JAA825DA", "AF-S VR DX 16-80mm 2.8-4.0E ED"},
 {0xAE,0x3C,0x80,0xA0,0x3C,0x3C,0xC9,0x4E,0x01,0x00,0x02, "Nikon", "JAA822DA", "AF-S Nikkor 200-500mm f/5.6E ED VR"},
 {0xAE,0x3C,0x80,0xA0,0x3C,0x3C,0xC9,0x0E,0x01,0x00,0x02, "Nikon", "JAA822DA", "AF-S Nikkor 200-500mm f/5.6E ED VR"},
diff --git a/src/olympusmn.cpp b/src/olympusmn.cpp
index 0acdf22..3173d97 100644
--- a/src/olympusmn.cpp
+++ b/src/olympusmn.cpp
@@ -738,7 +738,9 @@ namespace Exiv2 {
         { 5, "FL-36"    },
         { 6, "FL-50R"   },
         { 7, "FL-36R"   },
-        { 7, "FL-36R"   }                       // To silence compiler warning
+        { 9, "FL-14"    },
+        {11, "FL-600R"  },
+        {11, "FL-600R"  }                       // To silence compiler warning
     };
 
     const TagInfo OlympusMakerNote::tagInfoEq_[] = {
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index 4f265ec..544a47a 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -919,6 +919,7 @@ namespace Exiv2 {
         { 0x0822, "Sigma 18-300mm F3.5-6.3 DC Macro HSM" },
         { 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" },
+        { 0x083e, "HD PENTAX-D FA 24-70mm F2.8 ED SDM WR" },
         { 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" },

-- 
exiv2 packaging