[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=41d25bc

The following commit has been merged in the master branch:
commit 41d25bca56753abfc3b2a13b504397a7044100d3
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Thu Jun 30 02:46:28 2016 +0000

    Update various lists to match ExifTool version 10.21.
---
 src/minoltamn.cpp | 1 +
 src/olympusmn.cpp | 1 +
 src/pentaxmn.cpp  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index cdef640..5358e07 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -1930,6 +1930,7 @@ namespace Exiv2 {
         { 45851, "Tamron SP AF 300mm F2.8 LD IF" },
         { 45861, "Tamron SP AF 35-105mm F2.8 LD Aspherical IF" },
         { 45871, "Tamron AF 70-210mm F2.8 SP LD" },
+        { 65280, "Sigma 16mm F2.8 Filtermatic Fisheye" },
         {0xffff, "Manual lens | "                        // 1
                  "Sony E 50mm F1.8 OSS | "               // 2
                  "E PZ 16-50mm F3.5-5.6 OSS"             // 3
diff --git a/src/olympusmn.cpp b/src/olympusmn.cpp
index b0e061b..33053b2 100644
--- a/src/olympusmn.cpp
+++ b/src/olympusmn.cpp
@@ -619,6 +619,7 @@ namespace Exiv2 {
         {   3, N_("Muted")                },
         {   4, N_("Portrait")             },
         {   5, N_("i-Enhance")            },
+        {   6, N_("e-Portrait")           },
         {   7, N_("Color Creator")        },
         {   9, N_("Color Profile 1")      },
         {  10, N_("Color Profile 2")      },
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index e6c12d6..67ff679 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -980,6 +980,7 @@ namespace Exiv2 {
         { 0x1506, "06 Telephoto Zoom 15-45mm F2.8" },
         { 0x1507, "07 Mount Shield 11.5mm F9" },
         { 0x1508, "08 Wide Zoom 3.8-5.9mm F3.7-4" },
+        { 0x15e9, "Adapter Q for K-mount Lens" },
     };
 
     //! ImageTone, tag 0x004f

-- 
exiv2 packaging