[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=089760e

The following commit has been merged in the master branch:
commit 089760e7bb71aeae8f30783beb98ea09ef8cff5a
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Feb 7 06:26:15 2013 +0000

    Issue: #882 "Nikon AF-S Nikkor 28mm f/1.8G not recognized".  Thanks to Philip for reporting this and Niels for the patch.
---
 src/nikonmn.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 09e9d94..e7948a6 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -1971,8 +1971,10 @@ fmountlens[] = {
 {0xAF,0x54,0x44,0x44,0x0C,0x0C,0xB1,0x06,0x01,0x00,0x00, "Nikon", "JAA134DA", "AF-S Nikkor 35mm f/1.4G"},
 {0xB0,0x4C,0x50,0x50,0x14,0x14,0xB2,0x06,0x01,0x00,0x00, "Nikon", "JAA015DA", "AF-S Nikkor 50mm f/1.8G"},
 {0xB1,0x48,0x48,0x48,0x24,0x24,0xB3,0x06,0x01,0x00,0x00, "Nikon", "JAA638DA", "AF-S DX Micro Nikkor 40mm f/2.8G"},
-//B2
+//B2                B5
 {0xB3,0x4C,0x62,0x62,0x14,0x14,0xB5,0x06,0x01,0x00,0x00, "Nikon", "JAA341DA", "AF-S Nikkor 85mm f/1.8G"},
+{0xB4,0x40,0x37,0x62,0x2C,0x34,0xB6,0x0E,0x01,0x00,0x00, "Nikon", "", "AF-S VR Zoom-Nikkor 24-85mm f/3.5-4.5G IF-ED"},
+{0xB5,0x4C,0x3C,0x3C,0x14,0x14,0xB7,0x06,0x01,0x00,0x00, "Nikon", "", "AF-S Nikkor 28mm f/1.8G"},
 //
 {0x01,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00, "Nikon", "JAA90701", "TC-16A"},
 {0x01,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00, "Nikon", "JAA90701", "TC-16A"},

-- 
exiv2 packaging