[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=c38e7e0

The following commit has been merged in the master branch:
commit c38e7e086385e7174952ba3df7785765bfd54e1b
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sat Jan 24 02:37:48 2015 +0000

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

diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 4d928d2..a5d57e1 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -1730,14 +1730,14 @@ namespace Exiv2 {
 #ifndef FMOUNTLH
 #define FMOUNTLH
 //------------------------------------------------------------------------------
-// List of AF F-Mount lenses - Version 4.4.472.01                    2014-12-19
+// List of AF F-Mount lenses - Version 4.4.476.01                    2015-01-18
 //------------------------------------------------------------------------------
-#define FMLVERSION "4.4.472.01"
-#define FMLDATE "2014-12-19"
+#define FMLVERSION "4.4.476.01"
+#define FMLDATE "2015-01-18"
 //------------------------------------------------------------------------------
 //
 //
-// Created by Robert Rottmerhusen 2005 - 2014
+// Created by Robert Rottmerhusen 2005 - 2015
 // http://www.rottmerhusen.com (lens_id at rottmerhusen.com)
 //
 // For contributor info and more visit my online list:
@@ -2008,10 +2008,14 @@ fmountlens[] = {
 {0xB8,0x40,0x2D,0x44,0x2C,0x34,0xBA,0x06,0x01,0x00,0x00, "Nikon", "JAA818DA", "AF-S Nikkor 18-35mm f/3.5-4.5G ED"},
 {0xA0,0x40,0x2D,0x74,0x2C,0x3C,0xBB,0x0E,0x01,0x00,0x01, "Nikon", "JAA819DA", "AF-S DX Nikkor 18-140mm f/3.5-5.6G ED VR"},
 {0xA1,0x54,0x55,0x55,0x0C,0x0C,0xBC,0x06,0x01,0x00,0x01, "Nikon", "JAA136DA", "AF-S Nikkor 58mm f/1.4G"},
-{0xA2,0x40,0x2D,0x53,0x2C,0x3C,0xBD,0x0E,0x01,0x00,0x01, "Nikon", "JAA820DA", "AF-S DX VR Nikkor 18-55mm f/3.5-5.6G II"},
+{0xA2,0x40,0x2D,0x53,0x2C,0x3C,0xBD,0x0E,0x01,0x00,0x01, "Nikon", "JAA820DA", "AF-S DX Nikkor 18-55mm f/3.5-5.6G VR II"},
+{0xA4,0x40,0x2D,0x8E,0x2C,0x40,0xBF,0x0E,0x01,0x00,0x01, "Nikon", "JAA821DA", "AF-S DX Nikkor 18-300mm f/3.5-6.3G ED VR"},
 {0xA5,0x4C,0x44,0x44,0x14,0x14,0xC0,0x06,0x01,0x00,0x01, "Nikon", "JAA137DA", "AF-S Nikkor 35mm f/1.8G ED"},
+{0xA8,0x48,0x8E,0x8E,0x30,0x30,0xC3,0x4E,0x01,0x00,0x01, "Nikon", "JAA342DA", "AF-S Nikkor 300mm f/4E PF ED VR"},
 {0xA9,0x4C,0x31,0x31,0x14,0x14,0xC4,0x06,0x01,0x00,0x01, "Nikon", "JAA138DA", "AF-S Nikkor 20mm f/1.8G ED"},
 //
+//   3B 53 80 30 3C   " "0E" "01" "00" "01" "Nikon" "JAA823DA" "AF-S DX Nikkor 55-200mm f/4-5.6G VR II"
+//
 {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"},
 //
@@ -2185,6 +2189,7 @@ fmountlens[] = {
 {0x27,0x54,0x8E,0x8E,0x24,0x24,0x1D,0x02,0x00,0x00,0x00, "Tamron", "360E", "SP AF 300mm F/2.8 LD-IF"},
 //
 {0xF6,0x3F,0x18,0x37,0x2C,0x34,0x84,0x06,0x01,0x00,0x00, "Tamron", "B001", "SP AF 10-24mm F/3.5-4.5 Di II LD Aspherical (IF)"},
+{0xF6,0x3F,0x18,0x37,0x2C,0x34,0xDF,0x06,0x01,0x00,0x00, "Tamron", "B001", "SP AF 10-24mm f/3.5-4.5 Di II LD Aspherical (IF)"},
 {0x00,0x36,0x1C,0x2D,0x34,0x3C,0x00,0x06,0x00,0x00,0x00, "Tamron", "A13", "SP AF 11-18mm F/4.5-5.6 Di II LD Aspherical (IF)"},
 {0xEA,0x40,0x29,0x8E,0x2C,0x40,0xDF,0x0E,0x00,0x00,0x00, "Tamron", "B016", "AF 16-300mm F/3.5-6.3 Di II VC PZD"},
 {0x07,0x46,0x2B,0x44,0x24,0x30,0x03,0x02,0x00,0x00,0x00, "Tamron", "A05", "SP AF 17-35mm F/2.8-4 Di LD Aspherical (IF)"},

-- 
exiv2 packaging