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

The following commit has been merged in the master branch:
commit f3fe69ea18788a626393c46a78b856eaff716c6d
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sun Jan 15 04:29:31 2017 +0000

    Update Canon lens list to match ExifTool version 10.40.
---
 src/canonmn.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index a61365c..a863f3b 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -1050,6 +1050,7 @@ namespace Exiv2 {
         { 4155,"Canon EF-M 28mm f/3.5 Macro IS STM"                         },
         { 4156,"Canon EF 50mm f/1.8 STM"                                    },
         { 4157,"Canon EF-M 18-150mm 1:3.5-6.3 IS STM"                       },
+        {36910,"Canon EF 70-300mm f/4-5.6 IS II USM"                        },
         {36912,"Canon EF-S 18-135mm f/3.5-5.6 IS USM"                       },
         {65535,"n/a"                                                        }
     };

-- 
exiv2 packaging