[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=314b142

The following commit has been merged in the master branch:
commit 314b142dc2fa3fd75638d5748f26c2b48e76874a
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sun Nov 8 03:10:53 2015 +0000

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

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index ebf81b8..5a1a07d 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -825,6 +825,7 @@ namespace Exiv2 {
         { 180, "Sigma 24mm f/1.4 DG HSM | A"                                }, // 2
         { 180, "Zeiss Milvus 50mm f/1.4"                                    }, // 3
         { 180, "Zeiss Milvus 85mm f/1.4"                                    }, // 4
+        { 180, "Zeiss Otus 28mm f/1.4"                                      }, // 5
         { 181, "Canon EF 100-400mm f/4.5-5.6L IS + 1.4x"                    }, // 0
         { 181, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + 1.4x"               }, // 1
         { 182, "Canon EF 100-400mm f/4.5-5.6L IS + 2x"                      }, // 0
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index edeb232..115f370 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -190,6 +190,7 @@ namespace Exiv2 {
         {    0x13024, "K-S2" },
         {    0x1302e, "Q-S1" },
         {    0x13056, "WG-30" },
+        {    0x1307e, "WG-30W" },
         {    0x13088, "WG-5 GPS" },
         {    0x1309c, "K-3 II" },
     };

-- 
exiv2 packaging