[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=217ae24

The following commit has been merged in the master branch:
commit 217ae2449df23c2c89c8a1fe1819cbc7d056275b
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Mar 23 10:39:55 2012 +0000

    Updated Nikon Lens lookup table to v4.3.426.01 of Robert Rottmerhusen's fmountlens list.
---
 src/nikonmn.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 89f3c94..8f70099 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -1704,14 +1704,14 @@ namespace Exiv2 {
 #ifndef FMOUNTLH
 #define FMOUNTLH
 //------------------------------------------------------------------------------
-// List of AF F-Mount lenses - Version 4.3.424.01                    2011-10-07
+// List of AF F-Mount lenses - Version 4.3.426.01                    2012-02-24
 //------------------------------------------------------------------------------
-#define FMLVERSION "4.3.424.01"
-#define FMLDATE "2011-10-07"
+#define FMLVERSION "4.3.426.01"
+#define FMLDATE "2012-02-24"
 //------------------------------------------------------------------------------
 //
 //
-// Created by Robert Rottmerhusen 2005 - 2011
+// Created by Robert Rottmerhusen 2005 - 2012
 // http://www.rottmerhusen.com (lens_id at rottmerhusen.com)
 //
 // For contributor info and more visit my online list:
@@ -1971,6 +1971,8 @@ 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
+{0xB3,0x4C,0x62,0x62,0x14,0x14,0xB5,0x06,0x01,0x00,0x00, "Nikon", "JAA341DA", "AF-S Nikkor 85mm 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"},
@@ -2030,6 +2032,7 @@ fmountlens[] = {
 {0x26,0x40,0x27,0x3F,0x2C,0x34,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "15-30mm F3.5-4.5 EX DG Aspherical DF"},
 {0x48,0x48,0x2B,0x44,0x24,0x30,0x4B,0x06,0x00,0x00,0x05, "Sigma", "", "17-35mm F2.8-4 EX DG  Aspherical HSM"},
 {0x26,0x54,0x2B,0x44,0x24,0x30,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "17-35mm F2.8-4 EX Aspherical"},
+{0x9D,0x48,0x2B,0x50,0x24,0x24,0x4B,0x0E,0x00,0x00,0x05, "Sigma", "", "17-50mm F2.8 EX DC OS HSM"},
 {0x7A,0x47,0x2B,0x5C,0x24,0x34,0x4B,0x06,0x00,0x00,0x05, "Sigma", "689599", "17-70mm F2.8-4.5 DC Macro Asp. IF HSM"},
 {0x7A,0x48,0x2B,0x5C,0x24,0x34,0x4B,0x06,0x00,0x00,0x05, "Sigma", "689599", "17-70mm F2.8-4.5 DC Macro Asp. IF HSM"},
 {0x7F,0x48,0x2B,0x5C,0x24,0x34,0x1C,0x06,0x00,0x00,0x05, "Sigma", "", "17-70mm F2.8-4.5 DC Macro Asp. IF"},

-- 
exiv2 packaging