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

The following commit has been merged in the master branch:
commit b39f4a467a77397fea19f0b1db47af5b258cb091
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Jan 12 16:59:16 2013 +0000

    Issue: #876 and #877.  Addition to Canon Maker Notes.  Thanks to Markus for the fix.
---
 src/canonmn.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 61029fc..2fd0b72 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -180,6 +180,7 @@ namespace Exiv2 {
         { 0x80000297, N_("WFT-E2 II") },
         { 0x80000298, N_("WFT-E4 II") },
         { 0x80000301, N_("EOS Rebel T4i / 650D / Kiss X6i") },
+        { 0x80000302, N_("EOS 6D") },
     };
 
     //! SerialNumberFormat, tag 0x0015
@@ -669,7 +670,8 @@ namespace Exiv2 {
         { 491, "Canon EF 300mm f/2.8L IS II USM"                            },
         { 494, "Canon EF 600mm f/4.0L IS II USM"                            },
         { 495, "Canon EF 24-70mm f/2.8L II USM"                             },
-        { 4144,"Canon EF 40mm f/2.8 STM"                                    }
+        { 505, "Canon EF 35mm f/2 IS USM"                                   },
+		{ 4144,"Canon EF 40mm f/2.8 STM"                                    }
     };
 
     //! A lens id and a pretty-print function for special treatment of the id.

-- 
exiv2 packaging