[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=985d727

The following commit has been merged in the master branch:
commit 985d727511fa9e41c38405600bf8cfe48ec465eb
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sun Apr 26 02:55:15 2015 +0000

    Update Canon camera list and Minolta lens list to match ExifTool version 9.93.
---
 src/canonmn.cpp   |  3 +++
 src/minoltamn.cpp | 10 +++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 9906c24..e5bf78e 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -269,9 +269,12 @@ namespace Exiv2 {
         { (long int)0x3760000, "PowerShot SX520 HS" },
         { (long int)0x3770000, "PowerShot SX400 IS" },
         { (long int)0x3780000, "PowerShot G7 X" },
+        { (long int)0x3790000, "PowerShot N2" },
         { (long int)0x3800000, "PowerShot SX530 HS" },
         { (long int)0x3820000, "PowerShot SX710 HS" },
         { (long int)0x3830000, "PowerShot SX610 HS" },
+        { (long int)0x3870000, "PowerShot ELPH 160 / IXUS 160" },
+        { (long int)0x3890000, "PowerShot ELPH 170 IS / IXUS 170" },
         { (long int)0x3910000, "PowerShot SX410 HS" },
         { (long int)0x4040000, "PowerShot G1" },
         { (long int)0x6040000, "PowerShot S100 / Digital IXUS / IXY Digital" },
diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index d52b729..f0215e1 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -1678,16 +1678,20 @@ namespace Exiv2 {
         { 45,    "Carl Zeiss Planar T* 85mm F1.4 ZA (SAL85F14Z)" },
         { 46,    "Carl Zeiss Vario-Sonnar T* DT 16-80mm F3.5-4.5 ZA (SAL1680Z)" },
         { 47,    "Carl Zeiss Sonnar T* 135mm F1.8 ZA (SAL135F18Z)" },
-        { 48,    "Carl Zeiss Vario-Sonnar T* 24-70mm F2.8 ZA SSM (SAL2470Z)" },
+        { 48,    "Carl Zeiss Vario-Sonnar T* 24-70mm F2.8 ZA SSM (SAL2470Z) | "
+                 "Carl Zeiss Vario-Sonnar T* 24-70mm F2.8 ZA SSM II (SAL2470Z2)" },
         { 49,    "Sony AF DT 55-200mm F4-5.6 (SAL55200)" },
         { 50,    "Sony AF DT 18-250mm F3.5-6.3 (SAL18250)" },
         { 51,    "Sony AF DT 16-105mm F3.5-5.6 (SAL16105)" },
 //      { 51,    "Sony AF DT 55-200mm F4-5.5" }, // Anomaly? - unconfirmed.
         { 52,    "Sony 70-300mm F4.5-5.6 G SSM (SAL70300G) | "
+                 "Sony 70-300mm F4.5-5.6 G SSM II (SAL70300G2) | "
                  "Tamron SP 70-300mm F4-5.6 Di USD" },
         { 53,    "Sony AF 70-400mm F4.5-5.6 G SSM (SAL70400G)" },
-        { 54,    "Carl Zeiss Vario-Sonnar T* 16-35mm F2.8 ZA SSM (SAL1635Z)" },
-        { 55,    "Sony DT 18-55mm F3.5-5.6 SAM [II] (SAL1855)" },
+        { 54,    "Carl Zeiss Vario-Sonnar T* 16-35mm F2.8 ZA SSM (SAL1635Z) | "
+                 "Carl Zeiss Vario-Sonnar T* 16-35mm F2.8 ZA SSM II (SAL1635Z2)" },
+        { 55,    "Sony DT 18-55mm F3.5-5.6 SAM [II] (SAL1855) | "
+                 "Sony DT 18-55mm F3.5-5.6 SAM II (SAL18552)" },
         { 56,    "Sony AF DT 55-200mm F4-5.6 SAM (SAL55200-2)" },
         { 57,    "Sony DT 50mm F1.8 SAM (SAL50F18) | "
                  "Tamron SP AF 60mm F2 Di II LD [IF] Macro 1:1 | "

-- 
exiv2 packaging