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

The following commit has been merged in the master branch:
commit ab1b5165afd60f4217e1eb12667a1798b5dcf0f6
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Tue Feb 10 13:26:18 2015 +0000

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

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 2814837..1ba4c70 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -260,12 +260,13 @@ namespace Exiv2 {
         { (long int)0x3650000, "PowerShot D30" },
         { (long int)0x3660000, "PowerShot SX700 HS" },
         { (long int)0x3670000, "PowerShot SX600 HS" },
-        { (long int)0x3680000, "PowerShot ELPH 140 IS / IXUS 150" },
+        { (long int)0x3680000, "PowerShot ELPH 140 IS / IXUS 150 / IXY 130" },
         { (long int)0x3690000, "PowerShot ELPH 135 / IXUS 145 / IXY 120" },
         { (long int)0x3700000, "PowerShot ELPH 340 HS / IXUS 265 HS / IXY 630" },
         { (long int)0x3710000, "PowerShot ELPH 150 IS / IXUS 155 / IXY 140" },
         { (long int)0x3750000, "PowerShot SX60 HS" },
         { (long int)0x3760000, "PowerShot SX520 HS" },
+        { (long int)0x3770000, "PowerShot SX400 IS" },
         { (long int)0x3780000, "PowerShot G7 X" },
         { (long int)0x3800000, "PowerShot SX530 HS" },
         { (long int)0x3820000, "PowerShot SX710 HS" },
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index 3012e4e..02d0883 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -187,6 +187,7 @@ namespace Exiv2 {
         {    0x13006, "WG-20" },
         {    0x13010, "645Z" },
         {    0x1301a, "K-S1" },
+        {    0x13024, "K-S2" },
         {    0x1302e, "Q-S1" },
         {    0x13056, "WG-30" },
     };
@@ -907,6 +908,7 @@ namespace Exiv2 {
         { 0x081e, "Sigma 17-70mm F2.8-4 DC Macro HSM Contemporary" },
         { 0x081f, "Sigma 18-35mm F1.8 DC HSM" },
         { 0x0820, "Sigma 30mm F1.4 DC HSM | A" },
+        { 0x083b, "HD PENTAX-D FA 150-450mm F4.5-5.6 ED DC AW" },
         { 0x08c8, "HD PENTAX-DA 16-85mm F3.5-5.6 ED DC WR" },
         { 0x08d1, "HD PENTAX-DA 20-40mm F2.8-4 ED Limited DC WR" },
         { 0x08d2, "smc PENTAX-DA 18-270mm F3.5-6.3 ED SDM" },

-- 
exiv2 packaging