[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=885899a

The following commit has been merged in the master branch:
commit 885899ae6b5ff505b01aae0365e96bcc448f02b1
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sun Oct 4 03:10:01 2015 +0000

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

diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index af123d4..4fd6dd3 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -1732,10 +1732,10 @@ namespace Exiv2 {
 #ifndef FMOUNTLH
 #define FMOUNTLH
 //------------------------------------------------------------------------------
-// List of AF F-Mount lenses - Version 4.4.502.01                    2015-09-13
+// List of AF F-Mount lenses - Version 4.4.504.01                    2015-09-27
 //------------------------------------------------------------------------------
-#define FMLVERSION "4.4.502.01"
-#define FMLDATE "2015-09-13"
+#define FMLVERSION "4.4.504.01"
+#define FMLDATE "2015-09-27"
 //------------------------------------------------------------------------------
 //
 //
@@ -2021,8 +2021,9 @@ fmountlens[] = {
 {0xA9,0x4C,0x31,0x31,0x14,0x14,0xC4,0x06,0x01,0x00,0x01, "Nikon", "JAA138DA", "AF-S Nikkor 20mm f/1.8G ED"},
 {0xAA,0x48,0x37,0x5C,0x24,0x24,0xC5,0x4E,0x01,0x00,0x02, "Nikon", "JAA824DA", "AF-S Nikkor 24-70mm f/2.8E ED VR"},
 {0xAD,0x48,0x28,0x60,0x24,0x30,0xC8,0x4E,0x01,0x00,0x02, "Nikon", "JAA825DA", "AF-S VR DX 16-80mm 2.8-4.0E ED"},
-{0xAE,0x3C,0x80,0xA0,0x3C,0x3C,0xC9,0x0E,0x01,0x00,0x02, "Nikon", "", "AF-S Nikkor 200-500mm f/5.6E ED VR"},
-// "Nikon" "JAA139DA" "AF-S Nikkor 24mm f/1.8G ED"
+{0xAE,0x3C,0x80,0xA0,0x3C,0x3C,0xC9,0x4E,0x01,0x00,0x02, "Nikon", "JAA822DA", "AF-S Nikkor 200-500mm f/5.6E ED VR"},
+{0xAE,0x3C,0x80,0xA0,0x3C,0x3C,0xC9,0x0E,0x01,0x00,0x02, "Nikon", "JAA822DA", "AF-S Nikkor 200-500mm f/5.6E ED VR"},
+{0xAF,0x4C,0x37,0x37,0x14,0x14,0xCC,0x06,0x01,0x00,0x02, "Nikon", "JAA139DA", "AF-S Nikkor 24mm f/1.8G ED"},
 //
 //
 {0x01,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00, "Nikon", "JAA90701", "TC-16A"},

-- 
exiv2 packaging