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

The following commit has been merged in the master branch:
commit ce240e9043c8a995bc33b6283e92f6569732d1d1
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Fri Nov 27 02:45:58 2015 +0000

    Update various lists to match ExifTool version 10.07.
---
 src/canonmn.cpp  | 7 +++++--
 src/pentaxmn.cpp | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 5a1a07d..c9083cd 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -315,6 +315,7 @@ namespace Exiv2 {
         { (long int)0x4007da90, "HF S20/S21/S200" },
         { (long int)0x4007da92, "FS31/FS36/FS37/FS300/FS305/FS306/FS307" },
         { (long int)0x4007dda9, "HF G25" },
+        { (long int)0x4007dfb4, "XC10" },
         { (long int)0x80000001, "EOS-1D" },
         { (long int)0x80000167, "EOS-1DS" },
         { (long int)0x80000168, "EOS 10D" },
@@ -825,7 +826,7 @@ namespace Exiv2 {
         { 180, "Sigma 24mm f/1.4 DG HSM | A"                                }, // 2
         { 180, "Zeiss Milvus 50mm f/1.4"                                    }, // 3
         { 180, "Zeiss Milvus 85mm f/1.4"                                    }, // 4
-        { 180, "Zeiss Otus 28mm f/1.4"                                      }, // 5
+        { 180, "Zeiss Otus 28mm f/1.4 ZE"                                   }, // 5
         { 181, "Canon EF 100-400mm f/4.5-5.6L IS + 1.4x"                    }, // 0
         { 181, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + 1.4x"               }, // 1
         { 182, "Canon EF 100-400mm f/4.5-5.6L IS + 2x"                      }, // 0
@@ -897,7 +898,8 @@ namespace Exiv2 {
         { 248, "Canon EF 200mm f/2L IS"                                     }, // 0
         { 248, "Sigma 24-35mm f/2 DG HSM | A"                               }, // 1
         { 249, "Canon EF 800mm f/5.6L IS"                                   },
-        { 250, "Canon EF 24 f/1.4L II"                                      },
+        { 250, "Canon EF 24 f/1.4L II"                                      }, // 0
+        { 250, "Sigma 20mm f/1.4 DG HSM | A"                                }, // 1
         { 251, "Canon EF 70-200mm f/2.8L IS II USM"                         },
         { 252, "Canon EF 70-200mm f/2.8L IS II USM + 1.4x"                  },
         { 253, "Canon EF 70-200mm f/2.8L IS II USM + 2x"                    },
@@ -985,6 +987,7 @@ namespace Exiv2 {
         { 213, printCsLensByFocalLength }, // not tested
         { 234, printCsLensByFocalLength }, // not tested
         { 248, printCsLensByFocalLength }, // not tested
+        { 250, printCsLensByFocalLength }, // not tested
         { 255, printCsLensByFocalLength }, // not tested
         { 493, printCsLensByFocalLength }, // not tested
         { 4143,printCsLensByFocalLength }  // not tested
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index 3c3276f..097330d 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -954,7 +954,8 @@ namespace Exiv2 {
         { 0x0b0c, "smc PENTAX-FA 645 300mm F5.6 ED [IF]" },
         { 0x0b0e, "smc PENTAX-FA 645 55-110mm F5.6" },
         { 0x0b10, "smc PENTAX-FA 645 33-55mm F4.5 AL" },
-        { 0x0b11, "smc PENTAX-FA 645 150mm-300mm F5.6 ED [IF]" },
+        { 0x0b11, "smc PENTAX-FA 645 150-300mm F5.6 ED [IF]" },
+        { 0x0b15, "HD PENTAX-D FA 645 35mm F3.5 AL [IF]" },
         { 0x0d12, "smc PENTAX-D FA 645 55mm F2.8 AL [IF] SDM AW" },
         { 0x0d13, "smc PENTAX-D FA 645 25mm F4 AL [IF] SDM AW" },
         { 0x0d14, "HD PENTAX-D FA 645 90mm F2.8 ED AW SR" },

-- 
exiv2 packaging