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

The following commit has been merged in the master branch:
commit b8f86b1d6e53ac42b2ca63d3ba2f91ae65160e3b
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sat Jan 25 14:27:59 2014 +0000

    Update Canon lens list to match ExifTool version 9.48.
---
 src/canonmn.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index a982576..b529ae1 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -793,7 +793,8 @@ namespace Exiv2 {
         { 210, "Canon EF 28-90mm f/4-5.6 USM"                               },
         { 211, "Canon EF 28-200mm f/3.5-5.6 USM"                            },
         { 212, "Canon EF 28-105mm f/4-5.6 USM"                              },
-        { 213, "Canon EF 90-300mm f/4.5-5.6 USM"                            },
+        { 213, "Canon EF 90-300mm f/4.5-5.6 USM"                            }, // 0
+        { 213, "Tamron SP 150-600mm F/5-6.3 Di VC USD"                      }, // 1
         { 214, "Canon EF-S 18-55mm f/3.5-5.6 USM"                           },
         { 215, "Canon EF 55-200mm f/4.5-5.6 II USM"                         },
         { 224, "Canon EF 70-200mm f/2.8L IS"                                },
@@ -836,6 +837,7 @@ namespace Exiv2 {
         { 494, "Canon EF 600mm f/4.0L IS II USM"                            },
         { 495, "Canon EF 24-70mm f/2.8L II USM"                             },
         { 496, "Canon EF 200-400mm f/4L IS USM"                             },
+        { 499, "Canon EF 200-400mm f/4L IS USM + 1.4x"                      },
         { 502, "Canon EF 28mm f/2.8 IS USM"                                 },
         { 503, "Canon EF 24mm f/2.8 IS USM"                                 },
         { 504, "Canon EF 24-70mm f/4L IS USM"                               },

-- 
exiv2 packaging