[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=6751e38

The following commit has been merged in the master branch:
commit 6751e3892df42c0ef1f8b1d5f4fd764062679a03
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Apr 22 05:29:10 2012 +0000

    Updated Nikon Lens lookup table to v4.3.428.01 of Robert Rottmerhusen's fmountlens list.
---
 doc/ChangeLog   | 2 +-
 src/nikonmn.cpp | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index f54b79c..2338b87 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -33,7 +33,7 @@ Changes from version 0.22 to 0.23
 	- 0000790: XMP embedding corrupts CorelDRAW EPS files
 	- 0000778: Add support for Windows Live Photo Gallery face tags (Leif Huhn)
 	- 0000635: [Wish] Write support for Canon RAW CR2 files
-	         - Updated Nikon Lens lookup table to v4.3.426.01 of
+	         - Updated Nikon Lens lookup table to v4.3.428.01 of
 	           Robert Rottmerhusen's fmountlens list.
 	         - Added support for Nikon3 AF Fine Tune array. (Frans van den Bergh)
 	         - Added Canon EF-S 18-55mm f/3.5-5.6 III lens. (Jon Charnas)
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 8f70099..bb3748d 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -1704,10 +1704,10 @@ namespace Exiv2 {
 #ifndef FMOUNTLH
 #define FMOUNTLH
 //------------------------------------------------------------------------------
-// List of AF F-Mount lenses - Version 4.3.426.01                    2012-02-24
+// List of AF F-Mount lenses - Version 4.3.428.01                    2012-03-26
 //------------------------------------------------------------------------------
-#define FMLVERSION "4.3.426.01"
-#define FMLDATE "2012-02-24"
+#define FMLVERSION "4.3.428.01"
+#define FMLDATE "2012-03-26"
 //------------------------------------------------------------------------------
 //
 //
@@ -1997,6 +1997,7 @@ fmountlens[] = {
 {0x48,0x54,0x3E,0x3E,0x0C,0x0C,0x4B,0x06,0x01,0x00,0x05, "Sigma", "477554", "30mm F1.4 EX DC HSM"},
 {0xF8,0x54,0x3E,0x3E,0x0C,0x0C,0x4B,0x06,0x01,0x00,0x05, "Sigma", "477554", "30mm F1.4 EX DC HSM"},
 {0xDE,0x54,0x50,0x50,0x0C,0x0C,0x4B,0x06,0x01,0x00,0x05, "Sigma", "310554", "50mm F1.4 EX DG HSM"},
+{0x02,0x48,0x50,0x50,0x24,0x24,0x02,0x00,0x00,0x00,0x05, "Sigma", "", "Macro 50mm F2.8"},
 {0x32,0x54,0x50,0x50,0x24,0x24,0x35,0x02,0x00,0x00,0x05, "Sigma", "346447", "Macro 50mm F2.8 EX DG"},
 {0xE3,0x54,0x50,0x50,0x24,0x24,0x35,0x02,0x00,0x00,0x05, "Sigma", "", "Macro 50mm F2.8 EX DG"},
 {0x79,0x48,0x5C,0x5C,0x24,0x24,0x1C,0x06,0x00,0x00,0x05, "Sigma", "270599", "Macro 70mm F2.8 EX DG"},
@@ -2135,6 +2136,7 @@ fmountlens[] = {
 {0x00,0x3F,0x2D,0x80,0x2B,0x40,0x00,0x06,0x00,0x00,0x02, "Tamron", "A14", "AF 18-200mm F/3.5-6.3 XR Di II LD Aspherical (IF)"},
 {0x00,0x3F,0x2D,0x80,0x2C,0x40,0x00,0x06,0x00,0x00,0x02, "Tamron", "A14", "AF 18-200mm F/3.5-6.3 XR Di II LD Aspherical (IF) Macro"},
 {0x00,0x40,0x2D,0x80,0x2C,0x40,0x00,0x06,0x01,0x00,0x02, "Tamron", "A14NII", "AF 18-200mm F/3.5-6.3 XR Di II LD Aspherical (IF) Macro"},
+{0xFC,0x40,0x2D,0x80,0x2C,0x40,0xDF,0x06,0x01,0x00,0x02, "Tamron", "A14NII", "AF 18-200mm F/3.5-6.3 XR Di II LD Aspherical (IF) Macro"},
 {0x00,0x40,0x2D,0x88,0x2C,0x40,0x62,0x06,0x00,0x00,0x02, "Tamron", "A18", "AF 18-250mm F/3.5-6.3 Di II LD Aspherical (IF) Macro"},
 {0x00,0x40,0x2D,0x88,0x2C,0x40,0x00,0x06,0x01,0x00,0x02, "Tamron", "A18NII", "AF 18-250mm F/3.5-6.3 Di II LD Aspherical (IF) Macro "},
 {0xF5,0x40,0x2C,0x8A,0x2C,0x40,0x40,0x0E,0x01,0x00,0x02, "Tamron", "B003", "AF 18-270mm F/3.5-6.3 Di II VC LD Aspherical (IF) Macro"},

-- 
exiv2 packaging