[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=442ecf8

The following commit has been merged in the master branch:
commit 442ecf8e4eb526b1f2bba066053a19efcb2d851d
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sun Apr 13 01:47:46 2014 +0000

    Update Canon lens list to match ExifTool version 9.57.
---
 src/canonmn.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 7f15ee4..c0b36fa 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -636,12 +636,14 @@ namespace Exiv2 {
         {  32, "Sigma 15mm f/2.8 EX Fisheye"                                }, // 1
         {  33, "Voigtlander or Carl Zeiss Lens"                             }, // 0
         {  33, "Voigtlander Ultron 40mm f/2 SLII Aspherical"                }, // 1
-        {  33, "Carl Zeiss Distagon 15mm T* f/2.8 ZE"                       }, // 2
-        {  33, "Carl Zeiss Distagon 18mm T* f/3.5 ZE"                       }, // 3
-        {  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
+        {  33, "Voigtlander Color Skopar 20mm f/3.5 SLII Aspherical"        }, // 2
+        {  33, "Voigtlander APO-Lanthar 90mm f/3.5 SLII Close Focus"        }, // 3
+        {  33, "Carl Zeiss Distagon 15mm T* f/2.8 ZE"                       }, // 4
+        {  33, "Carl Zeiss Distagon 18mm T* f/3.5 ZE"                       }, // 5
+        {  33, "Carl Zeiss Distagon 21mm T* f/2.8 ZE"                       }, // 6
+        {  33, "Carl Zeiss Distagon 28mm T* f/2 ZE"                         }, // 7
+        {  33, "Carl Zeiss Distagon 35mm T* f/2 ZE"                         }, // 8
+        {  33, "Carl Zeiss Planar 50mm T* f/1.4 ZE"                         }, // 9
         {  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"                                   }, // 0

-- 
exiv2 packaging