[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=30c85bc

The following commit has been merged in the master branch:
commit 30c85bc833af591e9518a378ba5dd1376a15528c
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Aug 17 20:07:15 2016 +0000

    Fixing issues in test suite introduced by Thomas in r4379-r4396
---
 test/data/exiv2-test.out | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index 619a5fc..6dd1c2d 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -650,7 +650,7 @@ File  2/15: 20031214_000043.jpg
 20031214_000043.jpg   Exif.CanonCs.Saturation                      Short       1  Normal
 20031214_000043.jpg   Exif.CanonCs.Sharpness                       Short       1  Normal
 20031214_000043.jpg   Exif.CanonCs.ISOSpeed                        Short       1  100
-20031214_000043.jpg   Exif.CanonCs.MeteringMode                    Short       1  Center weighted
+20031214_000043.jpg   Exif.CanonCs.MeteringMode                    Short       1  Center-weighted average
 20031214_000043.jpg   Exif.CanonCs.FocusType                       Short       1  Auto
 20031214_000043.jpg   Exif.CanonCs.AFPoint                         Short       1  Center
 20031214_000043.jpg   Exif.CanonCs.ExposureProgram                 Short       1  Program (P)
@@ -2263,7 +2263,7 @@ Compare image data and extracted data ------------------------------------
 < 20031214_000043.jpg   Exif.CanonCs.Saturation                      Short       1  Normal
 < 20031214_000043.jpg   Exif.CanonCs.Sharpness                       Short       1  Normal
 < 20031214_000043.jpg   Exif.CanonCs.ISOSpeed                        Short       1  100
-< 20031214_000043.jpg   Exif.CanonCs.MeteringMode                    Short       1  Center weighted
+< 20031214_000043.jpg   Exif.CanonCs.MeteringMode                    Short       1  Center-weighted average
 < 20031214_000043.jpg   Exif.CanonCs.FocusType                       Short       1  Auto
 < 20031214_000043.jpg   Exif.CanonCs.AFPoint                         Short       1  Center
 < 20031214_000043.jpg   Exif.CanonCs.ExposureProgram                 Short       1  Program (P)
@@ -3804,7 +3804,7 @@ Compare image data and extracted data ------------------------------------
 > 20031214_000043.exv   Exif.CanonCs.Saturation                      Short       1  Normal
 > 20031214_000043.exv   Exif.CanonCs.Sharpness                       Short       1  Normal
 > 20031214_000043.exv   Exif.CanonCs.ISOSpeed                        Short       1  100
-> 20031214_000043.exv   Exif.CanonCs.MeteringMode                    Short       1  Center weighted
+> 20031214_000043.exv   Exif.CanonCs.MeteringMode                    Short       1  Center-weighted average
 > 20031214_000043.exv   Exif.CanonCs.FocusType                       Short       1  Auto
 > 20031214_000043.exv   Exif.CanonCs.AFPoint                         Short       1  Center
 > 20031214_000043.exv   Exif.CanonCs.ExposureProgram                 Short       1  Program (P)
@@ -5565,7 +5565,7 @@ Compare original and inserted image data ---------------------------------
 < 20031214_000043.jpg   Exif.CanonCs.Saturation                      Short       1  Normal
 < 20031214_000043.jpg   Exif.CanonCs.Sharpness                       Short       1  Normal
 < 20031214_000043.jpg   Exif.CanonCs.ISOSpeed                        Short       1  100
-< 20031214_000043.jpg   Exif.CanonCs.MeteringMode                    Short       1  Center weighted
+< 20031214_000043.jpg   Exif.CanonCs.MeteringMode                    Short       1  Center-weighted average
 < 20031214_000043.jpg   Exif.CanonCs.FocusType                       Short       1  Auto
 < 20031214_000043.jpg   Exif.CanonCs.AFPoint                         Short       1  Center
 < 20031214_000043.jpg   Exif.CanonCs.ExposureProgram                 Short       1  Program (P)
@@ -7106,7 +7106,7 @@ Compare original and inserted image data ---------------------------------
 > 20031214_000043.exv   Exif.CanonCs.Saturation                      Short       1  Normal
 > 20031214_000043.exv   Exif.CanonCs.Sharpness                       Short       1  Normal
 > 20031214_000043.exv   Exif.CanonCs.ISOSpeed                        Short       1  100
-> 20031214_000043.exv   Exif.CanonCs.MeteringMode                    Short       1  Center weighted
+> 20031214_000043.exv   Exif.CanonCs.MeteringMode                    Short       1  Center-weighted average
 > 20031214_000043.exv   Exif.CanonCs.FocusType                       Short       1  Auto
 > 20031214_000043.exv   Exif.CanonCs.AFPoint                         Short       1  Center
 > 20031214_000043.exv   Exif.CanonCs.ExposureProgram                 Short       1  Program (P)

-- 
exiv2 packaging