[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=69372bd

The following commit has been merged in the master branch:
commit 69372bd3ad814ca43b1465889108086947f8a1bc
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Thu May 15 03:34:23 2014 +0000

    Update camera and lens lists to match ExifTool version 9.60.
---
 src/canonmn.cpp  | 3 ++-
 src/pentaxmn.cpp | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index d30f404..6e12868 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -777,7 +777,8 @@ namespace Exiv2 {
         { 177, "Canon EF 300mm f/4L IS"                                     },
         { 178, "Canon EF 28-135mm f/3.5-5.6 IS"                             },
         { 179, "Canon EF 24mm f/1.4L"                                       },
-        { 180, "Canon EF 35mm f/1.4L"                                       },
+        { 180, "Canon EF 35mm f/1.4L"                                       }, // 0
+        { 180, "Sigma 50mm f/1.4 DG HSM | A"                                }, // 1
         { 181, "Canon EF 100-400mm f/4.5-5.6L IS + 1.4x"                    },
         { 182, "Canon EF 100-400mm f/4.5-5.6L IS + 2x"                      },
         { 183, "Canon EF 100-400mm f/4.5-5.6L IS"                           }, // 0
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index bd69c39..88fff92 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -182,6 +182,10 @@ namespace Exiv2 {
         {    0x12fb6, N_("K-50") },
         {    0x12fc0, N_("K-3") },
         {    0x12fca, N_("K-500") },
+        {    0x12fde, N_("WG-4 GPS") },
+        {    0x12fe8, N_("WG-4") },
+        {    0x13006, N_("WG-20") },
+        {    0x13010, N_("645Z") },
     };
 
     //! Quality, tag 0x0008
@@ -871,6 +875,7 @@ namespace Exiv2 {
         { 0x07f2, "smc PENTAX-DA* 16-50mm F2.8 ED AL [IF] SDM (SDM not used)" },
         { 0x07f3, "smc PENTAX-DA 70mm F2.4 Limited" },
         { 0x07f4, "smc PENTAX-DA 21mm F3.2 AL Limited" },
+        { 0x0800, "Sigma 50-150mm F2.8 II APO EX DC HSM" },
         { 0x0803, "Sigma AF 18-125mm F3.5-5.6 DC" },
         { 0x0804, "Sigma 50mm F1.4 EX DG HSM" },
         { 0x0807, "Sigma 24-70mm F2.8 IF EX DG HSM" },

-- 
exiv2 packaging