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

The following commit has been merged in the master branch:
commit 69720794d9524fc29b829ee7815f915fabc4456b
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sun Mar 31 03:24:53 2013 +0000

    Issue #832: Detect Carl Zeiss Planar 50mm T* f/1.4 ZE on Canon. Thanks to Stian Grindvoll for the patch.
---
 src/canonmn.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 20893d6..de992be 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -486,6 +486,7 @@ namespace Exiv2 {
         {  33, "Carl Zeiss Distagon 21mm T* f/2.8 ZE"                       }, // 4
         {  33, "Carl Zeiss Distagon 28mm T* f/2 ZE"                         }, // 5
         {  33, "Carl Zeiss Distagon 35mm T* f/2 ZE"                         }, // 6
+        {  33, "Carl Zeiss Planar 50mm T* f/1.4 ZE"                         }, // 7
         {  35, "Canon EF 35-80mm f/4-5.6"                                   },
         {  36, "Canon EF 38-76mm f/4.5-5.6"                                 },
         {  37, "Canon EF 35-80mm f/4-5.6 or Tamron Lens"                    }, // 0

-- 
exiv2 packaging