[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=1bcea30

The following commit has been merged in the master branch:
commit 1bcea3092c97f805aa57a9911d12679cde214a2b
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Mon Dec 9 04:12:01 2013 +0000

    Update camera and lens lists to match ExifTool version 9.43.
---
 src/canonmn.cpp | 1 +
 src/nikonmn.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index c7846a1..8d8cac3 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -322,6 +322,7 @@ namespace Exiv2 {
         { 0x80000325, N_("EOS 70D") },
         { 0x80000326, N_("EOS Rebel T5i / 700D / Kiss X7i") },
         { 0x80000331, N_("EOS M") },
+        { 0x80000355, N_("EOS M2") },
         { 0x80000346, N_("EOS Rebel SL1 / 100D / Kiss X7") },
     };
 
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 64e0254..97d641b 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -1959,7 +1959,7 @@ fmountlens[] = {
 {0xA0,0x40,0x2D,0x74,0x2C,0x3C,0xBB,0x0E,0x01,0x00,0x00, "Nikon", "", "AF-S DX Nikkor 18-140mm f/3.5-5.6G ED VR"},
 {0xA0,0x54,0x50,0x50,0x0C,0x0C,0xA2,0x06,0x01,0x00,0x00, "Nikon", "JAA014DA", "AF-S Nikkor 50mm f/1.4G"},
 {0xA1,0x40,0x18,0x37,0x2C,0x34,0xA3,0x06,0x01,0x00,0x00, "Nikon", "JAA804DA", "AF-S DX Nikkor 10-24mm f/3.5-4.5G ED"},
-{0xA1,0x54,0x55,0x55,0x0C,0x0C,0xBC,0x06,0x01,0x00,0x00, "Nikon", "", "AF-S Nikkor 58mm f/1.4 G"},
+{0xA1,0x54,0x55,0x55,0x0C,0x0C,0xBC,0x06,0x01,0x00,0x00, "Nikon", "", "AF-S Nikkor 58mm f/1.4G"},
 {0xA2,0x48,0x5C,0x80,0x24,0x24,0xA4,0x0E,0x13,0x00,0x00, "Nikon", "JAA807DA", "AF-S Nikkor 70-200mm f/2.8G ED VR II"},
 {0xA3,0x3C,0x29,0x44,0x30,0x30,0xA5,0x0E,0x01,0x00,0x00, "Nikon", "JAA806DA", "AF-S Nikkor 16-35mm f/4G ED VR"},
 {0xA4,0x54,0x37,0x37,0x0C,0x0C,0xA6,0x06,0x01,0x00,0x00, "Nikon", "JAA131DA", "AF-S Nikkor 24mm f/1.4G ED"},

-- 
exiv2 packaging