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

The following commit has been merged in the master branch:
commit faf28b0fd1d959ec4b2940cf64bf94ece5396cb3
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Wed May 13 16:24:59 2015 +0000

    Fix bug #1079: Rename Canon EF 50mm f/1.8 MkII.
---
 src/canonmn.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 1caa759..55b3788 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -649,7 +649,7 @@ namespace Exiv2 {
         {  28, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro"  }, // 2
         {  28, "Tamron AF 70-300mm f/4-5.6 Di LD 1:2 Macro"                 }, // 3
         {  28, "Tamron AF Aspherical 28-200mm f/3.8-5.6"                    }, // 4
-        {  29, "Canon EF 50mm f/1.8 MkII"                                   },
+        {  29, "Canon EF 50mm f/1.8 II"                                     },
         {  30, "Canon EF 35-105mm f/4.5-5.6"                                },
         {  31, "Canon EF 75-300mm f/4-5.6"                                  }, // 0
         {  31, "Tamron SP AF 300mm f/2.8 LD IF"                             }, // 1

-- 
exiv2 packaging