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

The following commit has been merged in the master branch:
commit ae3cc2a6c9415261e3e8f48135465bb2888718ae
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Fri Sep 5 03:04:27 2014 +0000

    Update various lists to match ExifTool version 9.70.
---
 src/canonmn.cpp  |  1 +
 src/nikonmn.cpp  | 18 +++++++++++++++---
 src/pentaxmn.cpp |  2 ++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 0afccd4..9d9eff3 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -872,6 +872,7 @@ namespace Exiv2 {
         { 4146,"Canon EF-S 18-55mm f/3.5-5.6 IS STM"                        },
         { 4147,"Canon EF-M 11-22mm f/4-5.6 IS STM"                          },
         { 4148,"Canon EF-S 55-250mm f/4-5.6 IS STM"                         },
+        { 4149,"Canon EF-M 55-200mm f/4.5-6.3 IS STM"                       },
         { 4150,"Canon EF-S 10-18mm f/4.5-5.6 IS STM"                        }
     };
 
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 2b9ab79..cd6848a 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -762,6 +762,14 @@ namespace Exiv2 {
         { 0x106, N_("Hi 1.5") },
         { 0x107, N_("Hi 1.7") },
         { 0x108, N_("Hi 2.0") },
+        { 0x109, N_("Hi 2.3") },
+        { 0x10a, N_("Hi 2.5") },
+        { 0x10b, N_("Hi 2.7") },
+        { 0x10c, N_("Hi 3.0") },
+        { 0x10d, N_("Hi 3.3") },
+        { 0x10e, N_("Hi 3.5") },
+        { 0x10f, N_("Hi 3.7") },
+        { 0x110, N_("Hi 4.0") },
         { 0x201, N_("Lo 0.3") },
         { 0x202, N_("Lo 0.5") },
         { 0x203, N_("Lo 0.7") },
@@ -839,9 +847,12 @@ namespace Exiv2 {
 
     //! PhaseDetectAF
     extern const TagDetails nikonPhaseDetectAF[] = {
-        { 0, N_("Off")           },
-        { 1, N_("On (51-point)") },
-        { 2, N_("On (11-point)") }
+        { 0, N_("Off")            },
+        { 1, N_("On (51-point)")  },
+        { 2, N_("On (11-point)")  },
+        { 3, N_("On (39-point)")  },
+        { 4, N_("On (hybrid)")    },
+        { 5, N_("On (105-point)") }
     };
 
     // Nikon3 Auto Focus Tag Info
@@ -2327,6 +2338,7 @@ fmountlens[] = {
 {0x4A,0x48,0x24,0x24,0x24,0x0C,0x4D,0x02,0x00,0x00,0x00, "Samyang", "", "AE 14mm f/2.8 ED AS IF UMC"},
 {0x4A,0x60,0x44,0x44,0x0C,0x0C,0x4D,0x02,0x00,0x00,0x00, "Samyang", "", "35mm f/1.4 AS UMC"},
 {0x4A,0x60,0x62,0x62,0x0C,0x0C,0x4D,0x02,0x00,0x00,0x00, "Samyang", "", "AE 85mm f/1.4 AS IF UMC"},
+{0x4A,0x54,0x29,0x29,0x18,0x0C,0x4D,0x02,0x00,0x00,0x00, "Samyang", "", "Samyang 16mm F2.0 ED AS UMC CS"},
 //
 {0x02,0x40,0x44,0x5C,0x2C,0x34,0x02,0x00,0x00,0x00,0x00, "Exakta", "", "AF 35-70mm 1:3.5-4.5 MC"},
 {0x07,0x3E,0x30,0x43,0x2D,0x35,0x03,0x00,0x00,0x00,0x00, "Soligor", "", "AF Zoom 19-35mm 1:3.5-4.5 MC"},
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index 176403b..70a7ce4 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -186,6 +186,7 @@ namespace Exiv2 {
         {    0x12fe8, N_("WG-4") },
         {    0x13006, N_("WG-20") },
         {    0x13010, N_("645Z") },
+        {    0x1301a, N_("K-S1") },
     };
 
     //! Quality, tag 0x0008
@@ -935,6 +936,7 @@ namespace Exiv2 {
         { 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" },
+        { 0x0dfd, "HD PENTAX-DA 645 28-45mm F4.5 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