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

The following commit has been merged in the master branch:
commit a869aff639ef78b608a95af3234889dfa70f5fe3
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Aug 15 14:57:35 2006 +0000

    Updated Nikon lens info to v2.02 of Robert Rottmerhusen's lens database
---
 src/nikonmn.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 2afa9bf..2fbfb10 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -741,10 +741,10 @@ namespace Exiv2 {
     {
 #ifdef EXV_HAVE_LENSDATA
         //#-----------------------------------------
-        //# List of AF F-Mount lenses - version 2.00
+        //# List of AF F-Mount lenses - version 2.02
         //#-----------------------------------------
         //#
-        //# created by Robert Rottmerhusen 2005
+        //# created by Robert Rottmerhusen 2005 - 2006
         //# http://www.rottmerhusen.com (info at rottmerhusen.com)
         //#
         //# with great help of Hiroshi Kamisaka (many new lenses)
@@ -856,8 +856,11 @@ namespace Exiv2 {
             {0x81,0x54,0x80,0x80,0x18,0x18,0x86,0x0E, "Nikon", "AF-S VR Nikkor 200mm f/2G IF-ED"},
             {0x82,0x48,0x8E,0x8E,0x24,0x24,0x87,0x0E, "Nikon", "AF-S VR Nikkor 300mm f/2.8G IF-ED"},
             {0x89,0x3C,0x53,0x80,0x30,0x3C,0x8B,0x06, "Nikon", "AF-S DX Zoom-Nikkor 55-200mm f/4-5.6G ED"},
+            {0x8A,0x54,0x6A,0x6A,0x24,0x24,0x8C,0x0E, "Nikon", "AF-S VR Micro-Nikkor 105mm f/2.8G IF-ED"},
             {0x8B,0x40,0x2D,0x80,0x2C,0x3C,0x8D,0x0E, "Nikon", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED"},
             {0x8C,0x40,0x2D,0x53,0x2C,0x3C,0x8E,0x06, "Nikon", "AF-S DX Zoom-Nikkor 18-55mm f/3.5-5.6G ED"},
+            {0x8F,0x40,0x2D,0x72,0x2C,0x3C,0x91,0x06, "Nikon", "AF-S DX Zoom-Nikkor 18-135mm f/3.5-5.6G IF-ED"},
+            //#"?? ?? 5C 8E 34 3C ??" "0E" "Nikon" "AF-S VR Zoom-Nikkor 70-300mm f/4.5-5.6G IF-ED";
             //#
             {0x06,0x3F,0x68,0x68,0x2C,0x2C,0x06,0x00, "Cosina", "100mm F/3.5 Macro"},
             //#

-- 
exiv2 packaging