[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=328ebcf

The following commit has been merged in the master branch:
commit 328ebcf4620479f7159d7a29f00949dc81f85fef
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sat Mar 5 03:23:36 2016 +0000

    Fix a couple of lens names to be consistent across lens mounts.
---
 src/canonmn.cpp             |   4 ++--
 test/data/bugfixes-test.out | Bin 1857519 -> 1857527 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 224de2b..8935122 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -793,7 +793,7 @@ namespace Exiv2 {
         { 160, "Tokina AT-X 124 AF 12-24mm f/4 DX"                          }, // 2
         { 160, "Tokina AT-X 107 AF DX Fish-eye 10-17mm f/3.5-4.5"           }, // 3
         { 160, "Tokina AT-X 116 PRO DX AF 11-16mm f/2.8"                    }, // 4
-        { 160, "Tokina AT-X 11 PRO DX Aspherical 11-20mm f/2.8"             }, // 5
+        { 160, "Tokina AT-X 11-20 F2.8 PRO DX Aspherical 11-20mm f/2.8"     }, // 5
         { 161, "Canon EF 28-70mm f/2.8L"                                    }, // 0
         { 161, "Sigma 24-70mm EX f/2.8"                                     }, // 1
         { 161, "Sigma 28-70mm f/2.8 EX"                                     }, // 2
@@ -895,7 +895,7 @@ namespace Exiv2 {
         { 232, "Canon EF 70-300mm f/4.5-5.6 DO IS USM"                      },
         { 233, "Canon EF 28-300mm f/3.5-5.6L IS"                            },
         { 234, "Canon EF-S 17-85mm f4-5.6 IS USM"                           }, // 0
-        { 234, "Tokina AT-X 12-28mm f/4 PRO DX"                             }, // 1
+        { 234, "Tokina AT-X 12-28 PRO DX 12-28mm f/4"                       }, // 1
         { 235, "Canon EF-S 10-22mm f/3.5-4.5 USM"                           },
         { 236, "Canon EF-S 60mm f/2.8 Macro USM"                            },
         { 237, "Canon EF 24-105mm f/4L IS"                                  },
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 3ab4673..e0ed355 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ

-- 
exiv2 packaging