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

The following commit has been merged in the master branch:
commit d4c4b489918ce7eadc24c5ec48ac751821beb32d
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sun Mar 30 02:56:47 2014 +0000

    Update camera and lens lists to match ExifTool version 9.55.
---
 src/canonmn.cpp  | 9 +++++++--
 src/nikonmn.cpp  | 1 +
 src/pentaxmn.cpp | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index e704b56..7f15ee4 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -216,7 +216,7 @@ namespace Exiv2 {
         { (long int)0x3110000, N_("PowerShot S100 (new)") },
         { (long int)0x3130000, N_("PowerShot SX40 HS") },
         { (long int)0x3120000, N_("PowerShot ELPH 310 HS / IXUS 230 HS / IXY 600F") },
-        { (long int)0x3140000, N_("PowerShot ELPH 500 HS / IXUS 320 HS / IXY 32S") },
+        { (long int)0x3140000, N_("IXY 32S") },
         { (long int)0x3160000, N_("PowerShot A1300") },
         { (long int)0x3170000, N_("PowerShot A810") },
         { (long int)0x3180000, N_("PowerShot ELPH 320 HS / IXUS 240 HS / IXY 420F") },
@@ -243,7 +243,7 @@ namespace Exiv2 {
         { (long int)0x3430000, N_("PowerShot A2600") },
         { (long int)0x3450000, N_("PowerShot A1400") },
         { (long int)0x3460000, N_("PowerShot ELPH 130 IS / IXUS 140 / IXY 110F") },
-        { (long int)0x3470000, N_("PowerShot ELPH 115 IS / IXUS 132/135 / IXY 90F") },
+        { (long int)0x3470000, N_("PowerShot ELPH 115/120 IS / IXUS 132/135 / IXY 90F/100F") },
         { (long int)0x3490000, N_("PowerShot ELPH 330 HS / IXUS 255 HS / IXY 610F") },
         { (long int)0x3510000, N_("PowerShot A2500") },
         { (long int)0x3540000, N_("PowerShot G16") },
@@ -251,11 +251,16 @@ namespace Exiv2 {
         { (long int)0x3560000, N_("PowerShot SX170 IS") },
         { (long int)0x3580000, N_("PowerShot SX510 HS") },
         { (long int)0x3590000, N_("PowerShot S200 (new)") },
+        { (long int)0x3600000, N_("IXY 620F") },
         { (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)0x3680000, N_("PowerShot ELPH 140 IS / IXUS 150") },
+        { (long int)0x3690000, N_("PowerShot ELPH 135 / IXUS 145 / IXY 120") },
+        { (long int)0x3700000, N_("PowerShot ELPH 340 HS / IXUS 265 HS / IXY 630") },
+        { (long int)0x3710000, N_("PowerShot ELPH 150 IS / IXUS 155 / IXY 140") },
         { (long int)0x4040000, N_("PowerShot G1") },
         { (long int)0x6040000, N_("PowerShot S100 / Digital IXUS / IXY Digital") },
         { (long int)0x4007d673, N_("DC19/DC21/DC22") },
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 37b2def..8acfa84 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -2022,6 +2022,7 @@ fmountlens[] = {
 {0xE5,0x54,0x6A,0x6A,0x24,0x24,0x35,0x02,0x40,0x00,0x00, "Sigma", "257446", "Macro 105mm F2.8 EX DG"},
 {0x48,0x48,0x76,0x76,0x24,0x24,0x4B,0x06,0x43,0x00,0x00, "Sigma", "104559", "APO Macro 150mm F2.8 EX DG HSM"},
 {0xF5,0x48,0x76,0x76,0x24,0x24,0x4B,0x06,0x43,0x00,0x00, "Sigma", "104559", "APO Macro 150mm F2.8 EX DG HSM"},
+{0x99,0x48,0x76,0x76,0x24,0x24,0x4B,0x0E,0x43,0x00,0x00, "Sigma", "", "APO Macro 150mm F2.8 EX DG OS HSM"},
 {0x48,0x4C,0x7C,0x7C,0x2C,0x2C,0x4B,0x02,0x43,0x00,0x00, "Sigma", "", "APO Macro 180mm F3.5 EX DG HSM"},
 {0x48,0x4C,0x7D,0x7D,0x2C,0x2C,0x4B,0x02,0x43,0x00,0x00, "Sigma", "105556", "APO Macro 180mm F3.5 EX DG HSM"},
 //M                                         "Sigma" ""       "APO 300mm F2.8";
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index 345cacd..dac5219 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -836,6 +836,7 @@ namespace Exiv2 {
         { 0x0700, "smc PENTAX-DA 21mm F3.2 AL Limited" },
         { 0x073a, "smc PENTAX-D FA Macro 100mm F2.8 WR" },
         { 0x074b, "Tamron SP AF 70-200mm F2.8 Di LD [IF] Macro (A001)" },
+        { 0x07c9, "smc Pentax-DA L 50-200mm F4-5.6 ED WR" },
         { 0x07ca, "smc PENTAX-DA L 18-55mm F3.5-5.6 AL WR" },
         { 0x07cb, "HD PENTAX-DA 55-300mm F4-5.8 ED WR" },
         { 0x07cc, "HD PENTAX-DA 15mm F4 ED AL Limited" },

-- 
exiv2 packaging