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

The following commit has been merged in the master branch:
commit d8457b2b3f3ed0987ada0c97f20c2900b6660af4
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Aug 14 05:43:21 2016 +0000

    #1102.  Correction to r4365.  canonmn.cpp#1238 should not have been changed.  Thanks to Sridhar for bringing this to my attention.
---
 src/canonmn.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index abed822..bcabc25 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -1235,7 +1235,7 @@ namespace Exiv2 {
         TagInfo(0x0019, "0x0019", "0x0019", N_("Unknown"), canonSiId, makerTags, unsignedShort, 1, printValue),
         TagInfo(0x001a, "0x001a", "0x001a", N_("Unknown"), canonSiId, makerTags, unsignedShort, 1, printValue),
         // End of list marker
-        TagInfo(0xffff, "(UnknownCanonSiTag)", "(UnknownCanonSiTag)", N_("Unknown Canon Camera Settings 2 tag"), canonSiId, makerTags, unsignedShort, 1, printValue)
+        TagInfo(0xffff, "(UnknownCanonCsTag)", "(UnknownCanonCsTag)", N_("Unknown Canon Camera Settings 1 tag"), canonCsId, makerTags, unsignedShort, 1, printValue)
     };
 
     const TagInfo* CanonMakerNote::tagListSi()

-- 
exiv2 packaging