[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=0c39802

The following commit has been merged in the master branch:
commit 0c39802d6d6883759c3fa49dd26a8af55c203832
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Tue Apr 28 04:17:17 2015 +0000

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

diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index f9a7593..a2bfa5c 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.481.01                    2015-04-12
+// List of AF F-Mount lenses - Version 4.4.482.01                    2015-04-26
 //------------------------------------------------------------------------------
-#define FMLVERSION "4.4.481.01"
-#define FMLDATE "2015-04-12"
+#define FMLVERSION "4.4.482.01"
+#define FMLDATE "2015-04-26"
 //------------------------------------------------------------------------------
 //
 //
@@ -1747,7 +1747,7 @@ namespace Exiv2 {
 //
 //
 // Seven misidentified lenses due to double LensIDs:
-//
+// 
 // 2F 48 30 44 24 24 29 02.1: Nikon AF Zoom-Nikkor 20-35mm f/2.8D IF
 // 2F 48 30 44 24 24 29 02.2: Tokina AT-X 235 AF PRO (AF 20-35mm f/2.8)
 //
@@ -1951,11 +1951,11 @@ fmountlens[] = {
 {0x81,0x54,0x80,0x80,0x18,0x18,0x86,0x0E,0x03,0x00,0x00, "Nikon", "JAA336DA", "AF-S VR Nikkor 200mm f/2G IF-ED"},
 {0x82,0x48,0x8E,0x8E,0x24,0x24,0x87,0x0E,0x13,0x00,0x00, "Nikon", "JAA337DA", "AF-S VR Nikkor 300mm f/2.8G IF-ED"},
 {0x83,0x00,0xB0,0xB0,0x5A,0x5A,0x88,0x04,0x00,0x00,0x00, "Nikon", "", "FSA-L2, EDG 65, 800mm F13 G"},
-//84
-//85
+//84                
+//85                 
 //86
 //87
-//88
+//88                
 {0x89,0x3C,0x53,0x80,0x30,0x3C,0x8B,0x06,0x01,0x00,0x00, "Nikon", "JAA793DA", "AF-S DX Zoom-Nikkor 55-200mm f/4-5.6G ED"},
 {0x8A,0x54,0x6A,0x6A,0x24,0x24,0x8C,0x0E,0x53,0x00,0x00, "Nikon", "JAA630DA", "AF-S VR Micro-Nikkor 105mm f/2.8G IF-ED"},
 {0x8B,0x40,0x2D,0x80,0x2C,0x3C,0x8D,0x0E,0x01,0x00,0x00, "Nikon", "JAA794DA", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED"},
@@ -2046,6 +2046,7 @@ fmountlens[] = {
 {0xF8,0x54,0x3E,0x3E,0x0C,0x0C,0x4B,0x06,0x01,0x00,0x00, "Sigma", "477554", "30mm F1.4 EX DC HSM"},
 {0x91,0x54,0x44,0x44,0x0C,0x0C,0x4B,0x06,0x01,0x00,0x00, "Sigma", "", "35mm F1.4 DG HSM"},
 {0xDE,0x54,0x50,0x50,0x0C,0x0C,0x4B,0x06,0x01,0x00,0x00, "Sigma", "310554", "50mm F1.4 EX DG HSM"},
+{0x88,0x54,0x50,0x50,0x0C,0x0C,0x4B,0x06,0x00,0x00,0x00, "Sigma", "", "Art 50mm F1.4 DG HSM"},
 {0x02,0x48,0x50,0x50,0x24,0x24,0x02,0x00,0x00,0x00,0x00, "Sigma", "", "Macro 50mm F2.8"},
 {0x32,0x54,0x50,0x50,0x24,0x24,0x35,0x02,0x00,0x00,0x00, "Sigma", "346447", "Macro 50mm F2.8 EX DG"},
 {0xE3,0x54,0x50,0x50,0x24,0x24,0x35,0x02,0x00,0x00,0x00, "Sigma", "", "Macro 50mm F2.8 EX DG"},
@@ -2329,10 +2330,10 @@ fmountlens[] = {
 {0x06,0x3F,0x68,0x68,0x2C,0x2C,0x06,0x00,0x00,0x00,0x00, "Cosina", "", "AF 100mm F3.5 Macro"},
 {0x07,0x36,0x3D,0x5F,0x2C,0x3C,0x03,0x00,0x00,0x00,0x00, "Cosina", "", "AF Zoom 28-80mm F3.5-5.6 MC Macro"},
 {0x07,0x46,0x3D,0x6A,0x25,0x2F,0x03,0x00,0x00,0x00,0x00, "Cosina", "", "AF Zoom 28-105mm F2.8-3.8 MC"},
-//M                                         "Cosina" "" "AF Zoom 28-210mm F3.5-5.6";
+//M                                         "Cosina" "" "AF Zoom 28-210mm F3.5-5.6"; 
 //M                                         "Cosina" "" "AF Zoom 28-210mm F4.2-6.5 Aspherical IF";
-//M                                         "Cosina" "" "AF Zoom 28-300mm F4.0-6.3";
-//M                                         "Cosina" "" "AF Zoom 70-210mm F2.8-4.0";
+//M                                         "Cosina" "" "AF Zoom 28-300mm F4.0-6.3"; 
+//M                                         "Cosina" "" "AF Zoom 70-210mm F2.8-4.0"; 
 {0x12,0x36,0x5C,0x81,0x35,0x3D,0x09,0x00,0x00,0x00,0x00, "Cosina", "", "AF Zoom 70-210mm F4.5-5.6 MC Macro"},
 {0x12,0x39,0x5C,0x8E,0x34,0x3D,0x08,0x02,0x00,0x00,0x00, "Cosina", "", "AF Zoom 70-300mm F4.5-5.6 MC Macro"},
 {0x12,0x3B,0x68,0x8D,0x3D,0x43,0x09,0x02,0x00,0x00,0x00, "Cosina", "", "AF Zoom 100-300mm F5.6-6.7 MC Macro"},

-- 
exiv2 packaging