[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=3967abf

The following commit has been merged in the master branch:
commit 3967abf862942263751b5bc09438f521c93394d9
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sun Apr 14 03:34:30 2013 +0000

    Update Nikon and Pentax lens lists to match ExifTool version 9.26.
---
 src/nikonmn.cpp  | 3 +++
 src/pentaxmn.cpp | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index d1c2c86..31efeac 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -1977,6 +1977,7 @@ fmountlens[] = {
 {0xB3,0x4C,0x62,0x62,0x14,0x14,0xB5,0x06,0x01,0x00,0x00, "Nikon", "JAA341DA", "AF-S Nikkor 85mm f/1.8G"},
 {0xB4,0x40,0x37,0x62,0x2C,0x34,0xB6,0x0E,0x01,0x00,0x00, "Nikon", "", "AF-S VR Zoom-Nikkor 24-85mm f/3.5-4.5G IF-ED"},
 {0xB5,0x4C,0x3C,0x3C,0x14,0x14,0xB7,0x06,0x01,0x00,0x00, "Nikon", "", "AF-S Nikkor 28mm f/1.8G"},
+{0xB7,0x44,0x60,0x98,0x34,0x3C,0xB9,0x0E,0x01,0x00,0x00, "Nikon", "", "AF-S Nikkor 80-400mm f/4.5-5.6G ED VR"},
 //
 {0x00,0x00,0x00,0x00,0x00,0x00,0xE1,0x12,0x00,0x00,0x00, "Nikon", "", "TC-17E II"},
 {0x00,0x00,0x00,0x00,0x00,0x00,0xF1,0x0C,0x00,0x00,0x00, "Nikon", "", "TC-14E II"},
@@ -2291,6 +2292,8 @@ fmountlens[] = {
 //
 {0x00,0x54,0x56,0x56,0x30,0x30,0x00,0x00,0x00,0x00,0x0C, "Coastal Optical Systems", "", "60mm 1:4 UV-VIS-IR Macro Apo"},
 //
+{0x00,0x40,0x11,0x11,0x2C,0x2C,0x00,0x00,0x00,0x00,0x1D, "Samyang", "", "Samyang 8mm f/3.5 Fish-Eye"},
+{0x4A,0x40,0x11,0x11,0x2C,0x0C,0x4D,0x02,0x00,0x00,0x1D, "Samyang", "", "Samyang 8mm f/3.5 Fish-Eye CS"},
 {0x4A,0x48,0x24,0x24,0x24,0x0C,0x4D,0x02,0x00,0x00,0x1D, "Samyang", "", "AE 14mm f/2.8 ED AS IF UMC"},
 {0x4A,0x60,0x44,0x44,0x0C,0x0C,0x4D,0x02,0x00,0x00,0x1D, "Samyang", "", "35mm f/1.4 AS UMC"},
 {0x4A,0x60,0x62,0x62,0x0C,0x0C,0x4D,0x02,0x00,0x00,0x1D, "Samyang", "", "AE 85mm f/1.4 AS IF UMC"},
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index 1c492dc..d9de90c 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -870,6 +870,7 @@ namespace Exiv2 {
         { 0x081b, "Sigma 18-200mm F3.5-6.3 II DC HSM" },
         { 0x081c, "Sigma 18-250mm F3.5-6.3 DC Macro HSM" },
         { 0x08d2, "smc PENTAX-DA 18-270mm F3.5-6.3 ED SDM" },
+        { 0x08d3, "HD PENTAX-DA 560mm F5.6 ED AW" },
         { 0x08d7, "smc PENTAX-DA 18-135mm F3.5-5.6 ED AL [IF] DC WR" },
         { 0x08e2, "smc PENTAX-DA* 55mm F1.4 SDM" },
         { 0x08e3, "smc PENTAX DA* 60-250mm F4 [IF] SDM"},
@@ -901,6 +902,7 @@ namespace Exiv2 {
         { 0x0b11, "smc PENTAX-FA 645 150mm-300mm F5.6 ED [IF]" },
         { 0x0d12, "smc PENTAX-D FA 645 55mm F2.8 AL [IF] SDM AW" },
         { 0x0d13, "smc PENTAX-D FA 645 25mm F4 AL [IF] SDM AW" },
+        { 0x0d14, "HD PENTAX-D FA 645 90mm F2.8 ED AW SR" },
         { 0x1500, "Pentax Q Manual Lens" },
         { 0x1501, "01 Standard Prime 8.5mm F1.9" },
         { 0x1502, "02 Standard Zoom 5-15mm F2.8-4.5" },

-- 
exiv2 packaging