[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=093210d

The following commit has been merged in the master branch:
commit 093210db82a13bbb9b3f12d93781c6178e96e099
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Apr 20 10:33:02 2011 +0000

    Added Tokina AT-X 107 AF DX Fish-eye 10-17mm f/3.5-4.5 lens (Milan Knizek)
---
 src/canonmn.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index bb9ce18..714196d 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -551,6 +551,7 @@ namespace Exiv2 {
         { 156, "Canon EF 28-105mm f/3.5-4.5 USM"                            },
         { 160, "Canon EF 20-35mm f/3.5-4.5 USM"                             }, // 0
         { 160, "Tamron AF 19-35mm f/3.5-4.5"                                }, // 1
+        { 160, "Tokina AT-X 107 AF DX Fish-eye 10-17mm f/3.5-4.5"           }, // 2
         { 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
@@ -671,6 +672,7 @@ namespace Exiv2 {
         { 150, printCsLensByFocalLength },
         { 152, printCsLensByFocalLength },
         { 153, printCsLensByFocalLength },
+        { 160, printCsLensByFocalLength },
         { 161, printCsLensByFocalLength },
         { 169, printCsLensByFocalLength },
         { 173, printCsLensByFocalLength }, // works partly

-- 
exiv2 packaging