[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=563f1c9

The following commit has been merged in the master branch:
commit 563f1c907d2ed5ebf674cb0ebaaf9e2f46e7edbd
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Tue Oct 8 03:17:13 2013 +0000

    Update camera and lens lists to match ExifTool version 9.38.
---
 src/canonmn.cpp   | 5 +++++
 src/minoltamn.cpp | 6 ++++--
 src/pentaxmn.cpp  | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 538a7db..3d6ba9c 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -246,6 +246,10 @@ namespace Exiv2 {
         { 0x3470000, N_("PowerShot ELPH 115 IS / IXUS 132/135 / IXY 90F") },
         { 0x3490000, N_("PowerShot ELPH 330 HS / IXUS 255 HS / IXY 610F") },
         { 0x3510000, N_("PowerShot A2500") },
+        { 0x3540000, N_("PowerShot G16") },
+        { 0x3550000, N_("PowerShot S120") },
+        { 0x3560000, N_("PowerShot SX170 IS") },
+        { 0x3580000, N_("PowerShot SX510 HS") },
         { 0x4040000, N_("PowerShot G1") },
         { 0x6040000, N_("PowerShot S100 / Digital IXUS / IXY Digital") },
         { 0x4007d673, N_("DC19/DC21/DC22") },
@@ -276,6 +280,7 @@ namespace Exiv2 {
         { 0x4007da8f, N_("HF M30/M31/M36/M300/M306") },
         { 0x4007da90, N_("HF S20/S21/S200") },
         { 0x4007da92, N_("FS31/FS36/FS37/FS300/FS305/FS306/FS307") },
+        { 0x4007dda9, N_("HF G25") },
         { 0x80000001, N_("EOS-1D") },
         { 0x80000167, N_("EOS-1DS") },
         { 0x80000168, N_("EOS 10D") },
diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 052a38c..2b3a438 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -1714,7 +1714,8 @@ namespace Exiv2 {
                  "Sigma 85mm F1.4 EX DG HSM | "
                  "Sigma 24-70mm F2.8 IF EX DG HSM | "
                  "Sigma 18-250mm F3.5-6.3 DC OS HSM | "
-                 "Sigma 17-50mm F2.8 EX DC HSM" },
+                 "Sigma 17-50mm F2.8 EX DC HSM | "
+                 "Sigma 17-50mm F2.8-4 DC Macro HSM" },
         { 129,   "Tamron 200-400mm F5.6 LD | "
                  "Tamron 70-300mm F4-5.6 LD" },
         { 131,   "Tamron 20-40mm F2.7-3.5 SP Aspherical IF" },
@@ -1755,7 +1756,8 @@ namespace Exiv2 {
         { 25530, "Minolta AF 28-135mm F4-4.5" },
         { 25531, "Minolta AF 28-135mm F4-4.5 | "
                  "Sigma ZOOM-alpha 35-135mm F3.5-4.5 | "
-                 "Sigma 28-105mm F2.8-4 Aspherical" },
+                 "Sigma 28-105mm F2.8-4 Aspherical | "
+                 "Sigma 28-105mm F4-5.6 UC" },
         { 25540, "Minolta AF 35-105mm F3.5-4.5" },
         { 25541, "Minolta AF 35-105mm F3.5-4.5" },
         { 25550, "Minolta AF 70-210mm F4" },
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index 37ef01d..b95b60d 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -879,6 +879,7 @@ namespace Exiv2 {
         { 0x0817, "Sigma 70-200mm F2.8 APO EX DG OS HSM" },
         { 0x081b, "Sigma 18-200mm F3.5-6.3 II DC HSM" },
         { 0x081c, "Sigma 18-250mm F3.5-6.3 DC Macro HSM" },
+        { 0x081e, "Sigma 17-70mm F2.8-4 DC Macro HSM Contemporary" },
         { 0x08d2, "smc PENTAX-DA 18-270mm F3.5-6.3 ED SDM" },
         { 0x08d3, "HD PENTAX-DA 560mm F5.6 ED AW" },
         { 0x08d7, "smc PENTAX-DA 18-135mm F3.5-5.6 ED AL [IF] DC WR" },

-- 
exiv2 packaging