[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=13d154d

The following commit has been merged in the master branch:
commit 13d154d04173010161bbc3719b941a82047d78a6
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Wed Jul 2 02:43:27 2014 +0000

    Update Canon and Pentax lens lists to match ExifTool version 9.66.
---
 src/canonmn.cpp  | 7 ++++---
 src/pentaxmn.cpp | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 0658ea2..fb9b087 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -744,9 +744,10 @@ namespace Exiv2 {
         { 161, "Canon EF 28-70mm f/2.8L"                                    }, // 0
         { 161, "Sigma 24-70mm EX f/2.8"                                     }, // 1
         { 161, "Sigma 28-70mm f/2.8 EX"                                     }, // 2
-        { 161, "Tamron AF 17-50mm f/2.8 Di-II LD Aspherical"                }, // 3
-        { 161, "Tamron 90mm f/2.8"                                          }, // 4
-        { 161, "Sigma 24-60mm f/2.8 EX DG"                                  }, // 5
+        { 161, "Sigma 24-60mm f/2.8 EX DG"                                  }, // 3
+        { 161, "Tamron AF 17-50mm f/2.8 Di-II LD Aspherical"                }, // 4
+        { 161, "Tamron 90mm f/2.8"                                          }, // 5
+        { 161, "Tamron SP AF 17-35mm f/2.8-4 Di LD Aspherical IF"           }, // 6
         { 162, "Canon EF 200mm f/2.8L"                                      },
         { 163, "Canon EF 300mm f/4L"                                        },
         { 164, "Canon EF 400mm f/5.6L"                                      },
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index 88fff92..48501a1 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -896,6 +896,7 @@ namespace Exiv2 {
         { 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" },
+        { 0x081f, "Sigma 18-35mm F1.8 DC HSM" },
         { 0x0820, "Sigma 30mm F1.4 DC HSM | A" },
         { 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