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

The following commit has been merged in the master branch:
commit d1035b4b762061ca814b0d8abcbf9af52457aab9
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Fri May 22 03:18:31 2015 +0000

    Update various lists to match ExifTool version 9.96.
---
 src/canonmn.cpp   | 6 ++++--
 src/minoltamn.cpp | 7 ++++---
 src/pentaxmn.cpp  | 1 +
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 55b3788..aa275da 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -885,7 +885,7 @@ namespace Exiv2 {
         { 255, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro"                   }, // 1
         { 488, "Canon EF-S 15-85mm f/3.5-5.6 IS USM"                        },
         { 489, "Canon EF 70-300mm f/4-5.6L IS USM"                          },
-        { 490, "Canon EF 8-15mm f/4L USM"                                   },
+        { 490, "Canon EF 8-15mm f/4L Fisheye USM"                           },
         { 491, "Canon EF 300mm f/2.8L IS II USM"                            },
         { 492, "Canon EF 400mm f/2.8L IS II USM"                            },
         { 493, "Canon EF 500mm f/4L IS II USM"                              }, // 0
@@ -898,6 +898,7 @@ namespace Exiv2 {
         { 503, "Canon EF 24mm f/2.8 IS USM"                                 },
         { 504, "Canon EF 24-70mm f/4L IS USM"                               },
         { 505, "Canon EF 35mm f/2 IS USM"                                   },
+        { 506, "Canon EF 400mm f/4 DO IS II USM"                            },
         { 507, "Canon EF 16-35mm f/4L IS USM"                               },
         { 508, "Canon EF 11-24mm f/4L USM"                                  },
         { 4142,"Canon EF-S 18-135mm f/3.5-5.6 IS STM"                       },
@@ -911,7 +912,8 @@ namespace Exiv2 {
         { 4149,"Canon EF-M 55-200mm f/4.5-6.3 IS STM"                       },
         { 4150,"Canon EF-S 10-18mm f/4.5-5.6 IS STM"                        },
         { 4152,"Canon EF 24-105mm f/3.5-5.6 IS STM"                         },
-        { 4154,"Canon EF-S 24mm f/2.8 STM"                                  }
+        { 4154,"Canon EF-S 24mm f/2.8 STM"                                  },
+        { 4156,"Canon EF 50mm f/1.8 STM"                                    }
     };
 
     //! A lens id and a pretty-print function for special treatment of the id.
diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 9b2eb79..9404270 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -1695,8 +1695,7 @@ namespace Exiv2 {
         { 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 | "
-                 "Tamron 18-270mm F3.5-6.3 Di II PZD | "
-                 "Sigma 18-35mm F1.8 DC HSM" },
+                 "Tamron 18-270mm F3.5-6.3 Di II PZD" },
         { 58,    "Sony AF DT 30mm F2.8 SAM Macro (SAL30M28)" },
         { 59,    "Sony 28-75mm F2.8 SAM (SAL2875)" },
         { 60,    "Carl Zeiss Distagon T* 24mm F2 ZA SSM (SAL24F20Z)" },
@@ -1729,7 +1728,8 @@ namespace Exiv2 {
                  "Sigma 150mm F2.8 EX DG OS HSM APO Macro | "
                  "Sigma 150-500mm F5-6.3 APO DG OS HSM | "
                  "Tamron AF 28-105mm F4-5.6 [IF] | "
-                 "Sigma 35mm F1.4 DG HSM" },
+                 "Sigma 35mm F1.4 DG HSM | "
+                 "Sigma 18-35mm F1.8 DC 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" },
@@ -1744,6 +1744,7 @@ namespace Exiv2 {
         { 194,   "Tamron SP AF 17-50mm F2.8 XR Di II LD Aspherical [IF]" },
         { 203,   "Tamron SP 70-200mm F2.8 Di USD" },
         { 204,   "Tamron SP 24-70mm F2.8 Di USD" },
+        { 213,   "Tamron 16-300mm F3.5-6.3 Di II PZD" },
         { 214,   "Tamron Tamron SP 150-600mm F5-6.3 Di USD" },
         { 224,   "Tamron SP 90mm F2.8 Di Macro 1:1 USD" },
         { 255,   "Tamron SP AF 17-50mm F2.8 XR Di II LD Aspherical | "
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index 3ddb2b0..ec906c1 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -190,6 +190,7 @@ namespace Exiv2 {
         {    0x13024, "K-S2" },
         {    0x1302e, "Q-S1" },
         {    0x13056, "WG-30" },
+        {    0x13088, "WG-5 GPS" },
         {    0x1309c, "K-3 II" },
     };
 

-- 
exiv2 packaging