[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=869df5e

The following commit has been merged in the master branch:
commit 869df5ea1ff9ed53194e9b1c9e5dc79354d9a16c
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Tue Feb 24 03:40:42 2015 +0000

    Add a lens from ExifTool version 9.86.
---
 src/canonmn.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 3083e58..1e2575c 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -880,7 +880,8 @@ namespace Exiv2 {
         { 490, "Canon EF 8-15mm f/4L USM"                                   },
         { 491, "Canon EF 300mm f/2.8L IS II USM"                            },
         { 492, "Canon EF 400mm f/2.8L IS II USM"                            },
-        { 493, "Canon EF 24-105mm f/4L IS USM"                              },
+        { 493, "Canon EF 500mm f/4L IS II USM"                              }, // 0
+        { 493, "Canon EF 24-105mm f/4L IS USM"                              }, // 1
         { 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"                             },
@@ -946,6 +947,7 @@ namespace Exiv2 {
         { 213, printCsLensByFocalLength }, // not tested
         { 234, printCsLensByFocalLength }, // not tested
         { 255, printCsLensByFocalLength }, // not tested
+        { 493, printCsLensByFocalLength }, // not tested
         { 4143,printCsLensByFocalLength }  // not tested
     };
 

-- 
exiv2 packaging