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

The following commit has been merged in the master branch:
commit 0c88b8c5f74f99907bfdc5044190880b7a63c76d
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Mar 13 03:49:02 2006 +0000

    Updated tests for changed Canon descriptionn (related to Rev. 698)
---
 test/data/bugfixes-test.out |   2 +-
 test/data/crw-test.out      | Bin 29298 -> 29594 bytes
 test/data/exiv2-test.out    |  10 +++++-----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 02466a1..f6db050 100644
--- a/test/data/bugfixes-test.out
+++ b/test/data/bugfixes-test.out
@@ -147,7 +147,7 @@ Exif.CanonCs1.ISOSpeed                       Short       1  100
 Exif.CanonCs1.MeteringMode                   Short       1  Center weighted
 Exif.CanonCs1.FocusType                      Short       1  Auto
 Exif.CanonCs1.AFPoint                        Short       1  Center
-Exif.CanonCs1.ExposureProgram                Short       1  Program
+Exif.CanonCs1.ExposureProgram                Short       1  Program (P)
 Exif.CanonCs1.0x0015                         Short       1  65535
 Exif.CanonCs1.0x0016                         Short       1  65535
 Exif.CanonCs1.Lens                           Short       3  7.1 - 21.3 mm
diff --git a/test/data/crw-test.out b/test/data/crw-test.out
index a5e9a55..f07b598 100644
Binary files a/test/data/crw-test.out and b/test/data/crw-test.out differ
diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index 8630547..49dfb85 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -22,7 +22,7 @@ Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301 USA
 
 Exiv2 help ---------------------------------------------------------------
-Usage: exiv2 [ options ] [ action ] file ...
+Usage: exiv2.exe [ options ] [ action ] file ...
 
 Manipulate the Exif metadata of images.
 
@@ -174,7 +174,7 @@ Flash bias      : 0 EV
 Focal length    : 21.3 mm
 Subject distance: 782
 ISO speed       : 100
-Exposure mode   : Program
+Exposure mode   : Program (P)
 Metering mode   : Center weighted
 Macro mode      : Off
 Image quality   : Superfine
@@ -274,7 +274,7 @@ Flash bias      : 0 EV
 Focal length    : 18.0 mm
 Subject distance: Infinite
 ISO speed       : 100
-Exposure mode   : Program
+Exposure mode   : Program (P)
 Metering mode   : Matrix
 Macro mode      : (0)
 Image quality   : Fine
@@ -505,7 +505,7 @@ Exif.CanonCs1.ISOSpeed                       Short       1  100
 Exif.CanonCs1.MeteringMode                   Short       1  Center weighted
 Exif.CanonCs1.FocusType                      Short       1  Auto
 Exif.CanonCs1.AFPoint                        Short       1  Center
-Exif.CanonCs1.ExposureProgram                Short       1  Program
+Exif.CanonCs1.ExposureProgram                Short       1  Program (P)
 Exif.CanonCs1.0x0015                         Short       1  65535
 Exif.CanonCs1.0x0016                         Short       1  65535
 Exif.CanonCs1.Lens                           Short       3  7.1 - 21.3 mm
@@ -859,7 +859,7 @@ Exif.CanonCs1.ISOSpeed                       Short       1  n/a
 Exif.CanonCs1.MeteringMode                   Short       1  Evaluative
 Exif.CanonCs1.FocusType                      Short       1  (2)
 Exif.CanonCs1.AFPoint                        Short       1  (8197)
-Exif.CanonCs1.ExposureProgram                Short       1  Program
+Exif.CanonCs1.ExposureProgram                Short       1  Program (P)
 Exif.CanonCs1.0x0015                         Short       1  32767
 Exif.CanonCs1.0x0016                         Short       1  65535
 Exif.CanonCs1.Lens                           Short       3  18.0 - 55.0 mm

-- 
exiv2 packaging