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

The following commit has been merged in the master branch:
commit f606c58a3d819647291ff3da01a00b1e6cb0a633
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sun Feb 16 06:55:29 2014 +0000

    Update Canon camera list and Pentax lens list to match ExifTool version 9.51.
---
 src/canonmn.cpp  | 7 +++++++
 src/pentaxmn.cpp | 1 +
 2 files changed, 8 insertions(+)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index b529ae1..86fc5e0 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -250,6 +250,12 @@ namespace Exiv2 {
         { (long int)0x3550000, N_("PowerShot S120") },
         { (long int)0x3560000, N_("PowerShot SX170 IS") },
         { (long int)0x3580000, N_("PowerShot SX510 HS") },
+        { (long int)0x3590000, N_("PowerShot S200 (new)") },
+        { (long int)0x3610000, N_("PowerShot N100") },
+        { (long int)0x3640000, N_("PowerShot G1 X Mark II") },
+        { (long int)0x3650000, N_("PowerShot D30") },
+        { (long int)0x3660000, N_("PowerShot SX700 HS") },
+        { (long int)0x3670000, N_("PowerShot SX600 HS") },
         { (long int)0x4040000, N_("PowerShot G1") },
         { (long int)0x6040000, N_("PowerShot S100 / Digital IXUS / IXY Digital") },
         { (long int)0x4007d673, N_("DC19/DC21/DC22") },
@@ -321,6 +327,7 @@ namespace Exiv2 {
         { (long int)0x80000324, N_("EOS-1D C") },
         { (long int)0x80000325, N_("EOS 70D") },
         { (long int)0x80000326, N_("EOS Rebel T5i / 700D / Kiss X7i") },
+        { (long int)0x80000327, N_("EOS Rebel T5 / 1200D / Kiss X70") },
         { (long int)0x80000331, N_("EOS M") },
         { (long int)0x80000355, N_("EOS M2") },
         { (long int)0x80000346, N_("EOS Rebel SL1 / 100D / Kiss X7") },
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index bf77832..5f92dd6 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -887,6 +887,7 @@ namespace Exiv2 {
         { 0x0819, "Sigma 17-50mm F2.8 EX DC HSM" },
         { 0x081b, "Sigma 18-200mm F3.5-6.3 II DC HSM" },
         { 0x081c, "Sigma 18-250mm F3.5-6.3 DC Macro HSM" },
+        { 0x081d, "Sigma 35mm F1.4 DG HSM" },
         { 0x081e, "Sigma 17-70mm F2.8-4 DC Macro HSM Contemporary" },
         { 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