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

The following commit has been merged in the master branch:
commit c274b27284a895a1d7d029abd143c963ccad9b65
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sun Apr 12 02:11:40 2015 +0000

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

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index f348dc1..9906c24 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -264,6 +264,7 @@ namespace Exiv2 {
         { (long int)0x3690000, "PowerShot ELPH 135 / IXUS 145 / IXY 120" },
         { (long int)0x3700000, "PowerShot ELPH 340 HS / IXUS 265 HS / IXY 630" },
         { (long int)0x3710000, "PowerShot ELPH 150 IS / IXUS 155 / IXY 140" },
+        { (long int)0x3740000, "EOS M3" },
         { (long int)0x3750000, "PowerShot SX60 HS" },
         { (long int)0x3760000, "PowerShot SX520 HS" },
         { (long int)0x3770000, "PowerShot SX400 IS" },
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index a6da400..a794d62 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -2358,6 +2358,7 @@ fmountlens[] = {
 {0x00,0x54,0x56,0x56,0x30,0x30,0x00,0x00,0x00,0x00,0x00, "Coastal Optical Systems", "", "60mm 1:4 UV-VIS-IR Macro Apo"},
 //
 {0x4A,0x40,0x11,0x11,0x2C,0x0C,0x4D,0x02,0x00,0x00,0x00, "Samyang", "", "8mm f/3.5 Fish-Eye CS"},
+{0x4A,0x48,0x1E,0x1E,0x24,0x0C,0x4D,0x02,0x00,0x00,0x00, "Samyang", "", "12mm f/2.8 ED AS NCS Fish-Eye"},
 {0x4A,0x48,0x24,0x24,0x24,0x0C,0x4D,0x02,0x00,0x00,0x00, "Samyang", "", "AE 14mm f/2.8 ED AS IF UMC"},
 {0x4A,0x54,0x29,0x29,0x18,0x0C,0x4D,0x02,0x00,0x00,0x00, "Samyang", "", "16mm F2.0 ED AS UMC CS"},
 {0x4A,0x60,0x44,0x44,0x0C,0x0C,0x4D,0x02,0x00,0x00,0x00, "Samyang", "", "35mm f/1.4 AS UMC"},

-- 
exiv2 packaging