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

The following commit has been merged in the master branch:
commit c8339a71647e498cc97fa52c7ccfb8e92ca68afa
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sun Dec 14 02:41:47 2014 +0000

    Update various lists to match ExifTool version 9.78.
---
 src/canonmn.cpp | 4 +++-
 src/nikonmn.cpp | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 051a27f..6838312 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -422,7 +422,8 @@ namespace Exiv2 {
         { 3,   N_("Fine")         },
         { 4,   N_("RAW")          },
         { 5,   N_("Superfine")    },
-        { 130, N_("Normal Movie") }
+        { 130, N_("Normal Movie") },
+        { 131, N_("Movie (2)")    }
     };
 
     //! FlashMode, tag 0x0004
@@ -795,6 +796,7 @@ namespace Exiv2 {
         { 183, "Canon EF 100-400mm f/4.5-5.6L IS"                           }, // 0
         { 183, "Sigma 150mm f/2.8 EX DG OS HSM APO Macro"                   }, // 1
         { 183, "Sigma 105mm f/2.8 EX DG OS HSM Macro"                       }, // 2
+        { 183, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro"                   }, // 3
         { 184, "Canon EF 400mm f/2.8L + 2x"                                 },
         { 185, "Canon EF 600mm f/4L IS"                                     },
         { 186, "Canon EF 70-200mm f/4L"                                     },
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index a622a43..6ca64cf 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -2342,12 +2342,13 @@ fmountlens[] = {
 {0x00,0x54,0x50,0x50,0x18,0x18,0x00,0x00,0x00,0x00,0x00, "Carl Zeiss", "", "Makro-Planar T* 2/50 ZF.2"},
 {0x00,0x54,0x62,0x62,0x0C,0x0C,0x00,0x00,0x00,0x00,0x00, "Carl Zeiss", "", "Planar T* 1,4/85 ZF.2"},
 {0x00,0x54,0x68,0x68,0x18,0x18,0x00,0x00,0x00,0x00,0x00, "Carl Zeiss", "", "Makro-Planar T* 2/100 ZF.2"},
+{0x00,0x54,0x53,0x53,0x0C,0x0C,0x00,0x00,0x00,0x00,0x00, "Zeiss", "", "55mm f/1.4 Otus Distagon T*"},
 //
 {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,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,0x54,0x29,0x29,0x18,0x0C,0x4D,0x02,0x00,0x00,0x00, "Samyang", "", "16mm 2.0 ED AS UMC CS"},
 {0x4A,0x60,0x44,0x44,0x0C,0x0C,0x4D,0x02,0x00,0x00,0x00, "Samyang", "", "35mm f/1.4 AS UMC"},
 {0x4A,0x60,0x62,0x62,0x0C,0x0C,0x4D,0x02,0x00,0x00,0x00, "Samyang", "", "AE 85mm f/1.4 AS IF UMC"},
 //

-- 
exiv2 packaging