[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=36b42ea

The following commit has been merged in the master branch:
commit 36b42eabebe31df042c4f2e91ae0bf3f55624607
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Fri Mar 11 16:59:31 2016 +0000

    More consistency fixes.
---
 src/canonmn.cpp | 2 +-
 src/nikonmn.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 3d52cfa..0d61cec 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -809,7 +809,7 @@ namespace Exiv2 {
         { 166, "Canon EF 70-200mm f/2.8 L + 1.4x"                           },
         { 167, "Canon EF 70-200mm f/2.8 L + 2x"                             },
         { 168, "Canon EF 28mm f/1.8 USM"                                    }, // 0
-        { 168, "Sigma 50-100mm F1.8 DC HSM Art"                             }, // 1
+        { 168, "Sigma 50-100mm f/1.8 DC HSM Art"                            }, // 1
         { 169, "Canon EF 17-35mm f/2.8L"                                    }, // 0
         { 169, "Sigma 18-200mm f/3.5-6.3 DC OS"                             }, // 1
         { 169, "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"                   }, // 2
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index dca364d..44d47d7 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -2054,7 +2054,7 @@ fmountlens[] = {
 {0xF8,0x54,0x3E,0x3E,0x0C,0x0C,0x4B,0x06,0x01,0x00,0x00, "Sigma", "477554", "30mm F1.4 EX DC HSM"},
 {0x91,0x54,0x44,0x44,0x0C,0x0C,0x4B,0x06,0x01,0x00,0x00, "Sigma", "", "35mm F1.4 DG HSM"},
 {0xDE,0x54,0x50,0x50,0x0C,0x0C,0x4B,0x06,0x01,0x00,0x00, "Sigma", "310554", "50mm F1.4 EX DG HSM"},
-{0x88,0x54,0x50,0x50,0x0C,0x0C,0x4B,0x06,0x00,0x00,0x00, "Sigma", "", "50mm F1.4 DG HSM | A"},
+{0x88,0x54,0x50,0x50,0x0C,0x0C,0x4B,0x06,0x00,0x00,0x00, "Sigma", "", "50mm F1.4 DG HSM Art"},
 {0x02,0x48,0x50,0x50,0x24,0x24,0x02,0x00,0x00,0x00,0x00, "Sigma", "", "Macro 50mm F2.8"},
 {0x32,0x54,0x50,0x50,0x24,0x24,0x35,0x02,0x00,0x00,0x00, "Sigma", "346447", "Macro 50mm F2.8 EX DG"},
 {0xE3,0x54,0x50,0x50,0x24,0x24,0x35,0x02,0x00,0x00,0x00, "Sigma", "", "Macro 50mm F2.8 EX DG"},

-- 
exiv2 packaging