[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=3c13ba0

The following commit has been merged in the master branch:
commit 3c13ba01ccfc0c2d6fde3e10007b37badd0a8640
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Jan 14 14:18:14 2009 +0000

    #603: Added new Tamron lens and lens data version number (Thanks to Niels Kristian Bech Jensen).
---
 src/nikonmn.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 32eee98..68021ca 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -1248,6 +1248,7 @@ fmountlens[] = {
 {0x00,0x54,0x2B,0x50,0x24,0x24,0x00,0x06, "Tamron", "SP AF 17-50mm F/2.8 XR Di II LD Aspherical [IF] (A16NII)"},
 {0x00,0x3F,0x2D,0x80,0x2B,0x40,0x00,0x06, "Tamron", "AF 18-200mm F/3.5-6.3 XR Di II LD Aspherical (IF)"},
 {0x00,0x3F,0x2D,0x80,0x2C,0x40,0x00,0x06, "Tamron", "AF 18-200mm F/3.5-6.3 XR Di II LD Aspherical (IF) Macro"},
+{0x00,0x40,0x2D,0x80,0x2C,0x40,0x00,0x06, "Tamron", "AF 18-200mm F/3.5-6.3 XR Di-II LD Aspherical (IF) Macro"},
 {0x00,0x40,0x2D,0x88,0x2C,0x40,0x62,0x06, "Tamron", "AF 18-250mm F/3.5-6.3 Di II LD Aspherical (IF) Macro"},
 {0x00,0x40,0x2D,0x88,0x2C,0x40,0x00,0x06, "Tamron", "AF 18-250mm F/3.5-6.3 Di II LD Aspherical (IF) Macro (A18NII)"},
 {0xF5,0x40,0x2C,0x8A,0x2C,0x40,0x40,0x0E, "Tamron", "AF 18-270mm F/3.5-6.3 Di II VC LD Aspherical [IF] Macro"},
@@ -1334,7 +1335,8 @@ fmountlens[] = {
             idx = 11;
         }
         else if (   0 == memcmp(lens.pData_, "0201", 4)
-                 || 0 == memcmp(lens.pData_, "0202", 4)) {
+                 || 0 == memcmp(lens.pData_, "0202", 4)
+                 || 0 == memcmp(lens.pData_, "0203", 4)) {
             if (metadata) {
                 // The decrypt algorithm requires access to serial number
                 // and shutter count tags

-- 
exiv2 packaging