[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=0af43f7

The following commit has been merged in the master branch:
commit 0af43f7fb3dadb79fdb0a71f99f5bd6915a3f495
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Apr 28 15:12:07 2010 +0000

    Fixed easy-access and tests for r2203
---
 src/easyaccess.cpp        | 4 ++--
 test/data/write2-test.out | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/easyaccess.cpp b/src/easyaccess.cpp
index 87a3e33..5680cac 100644
--- a/src/easyaccess.cpp
+++ b/src/easyaccess.cpp
@@ -87,8 +87,8 @@ namespace Exiv2 {
             "Exif.Nikon3.ISOSpeed",
             "Exif.NikonIi.ISO",
             "Exif.NikonIi.ISO2",
-            "Exif.MinoltaCsNew.ISOSpeed",
-            "Exif.MinoltaCsOld.ISOSpeed",
+            "Exif.MinoltaCsNew.ISOSetting",
+            "Exif.MinoltaCsOld.ISOSetting",
             "Exif.MinoltaCs5D.ISOSpeed",
             "Exif.MinoltaCs7D.ISOSpeed",
             "Exif.Pentax.ISO",
diff --git a/test/data/write2-test.out b/test/data/write2-test.out
index 2b94091..62c9bdb 100644
--- a/test/data/write2-test.out
+++ b/test/data/write2-test.out
@@ -172,7 +172,7 @@ Exif.MinoltaCs5D.FocusArea                    0x001b Makernote    Short       1
 Exif.MinoltaCs5D.0x001c                       0x001c Makernote    Short       1 0
 Exif.MinoltaCs5D.0x001d                       0x001d Makernote    Short       1 0
 Exif.MinoltaCs5D.0x001e                       0x001e Makernote    Short       1 0
-Exif.MinoltaCs5D.Flash                        0x001f Makernote    Short       1 0
+Exif.MinoltaCs5D.FlashFired                   0x001f Makernote    Short       1 0
 Exif.MinoltaCs5D.0x0020                       0x0020 Makernote    Short       1 0
 Exif.MinoltaCs5D.0x0021                       0x0021 Makernote    Short       1 0
 Exif.MinoltaCs5D.0x0022                       0x0022 Makernote    Short       1 0
@@ -236,7 +236,7 @@ Exif.MinoltaCs7D.0x0011                       0x0011 Makernote    Short       1
 Exif.MinoltaCs7D.0x0012                       0x0012 Makernote    Short       1 0
 Exif.MinoltaCs7D.0x0013                       0x0013 Makernote    Short       1 0
 Exif.MinoltaCs7D.0x0014                       0x0014 Makernote    Short       1 0
-Exif.MinoltaCs7D.Flash                        0x0015 Makernote    Short       1 0
+Exif.MinoltaCs7D.FlashFired                   0x0015 Makernote    Short       1 0
 Exif.MinoltaCs7D.FlashMode                    0x0016 Makernote    Short       1 0
 Exif.MinoltaCs7D.0x0017                       0x0017 Makernote    Short       1 0
 Exif.MinoltaCs7D.0x0018                       0x0018 Makernote    Short       1 0

-- 
exiv2 packaging