[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=9800e7b

The following commit has been merged in the master branch:
commit 9800e7b37823bfaa8f434a399851e636e4046ff9
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sat Apr 27 15:10:21 2013 +0000

    Update test output to match r3023.
---
 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 3ea4d3f..46b15a2 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -1885,7 +1885,7 @@ File 14/15: 20001004_015404.jpg
 20001004_015404.jpg   Exif.CanonCs.AFPoint                         Short       1  Auto-selected
 20001004_015404.jpg   Exif.CanonCs.ExposureProgram                 Short       1  Aperture priority (Av)
 20001004_015404.jpg   Exif.CanonCs.0x0015                          Short       1  0
-20001004_015404.jpg   Exif.CanonCs.LensType                        Short       1  Canon EF 28-70mm f/2.8L or Sigma or Tamron Lens
+20001004_015404.jpg   Exif.CanonCs.LensType                        Short       1  Canon EF 28-70mm f/2.8L
 20001004_015404.jpg   Exif.CanonCs.Lens                            Short       3  28.0 - 70.0 mm
 20001004_015404.jpg   Exif.CanonCs.MaxAperture                     Short       1  F2.8
 20001004_015404.jpg   Exif.CanonCs.MinAperture                     Short       1  F22
@@ -3497,7 +3497,7 @@ Compare image data and extracted data ------------------------------------
 < 20001004_015404.jpg   Exif.CanonCs.AFPoint                         Short       1  Auto-selected
 < 20001004_015404.jpg   Exif.CanonCs.ExposureProgram                 Short       1  Aperture priority (Av)
 < 20001004_015404.jpg   Exif.CanonCs.0x0015                          Short       1  0
-< 20001004_015404.jpg   Exif.CanonCs.LensType                        Short       1  Canon EF 28-70mm f/2.8L or Sigma or Tamron Lens
+< 20001004_015404.jpg   Exif.CanonCs.LensType                        Short       1  Canon EF 28-70mm f/2.8L
 < 20001004_015404.jpg   Exif.CanonCs.Lens                            Short       3  28.0 - 70.0 mm
 < 20001004_015404.jpg   Exif.CanonCs.MaxAperture                     Short       1  F2.8
 < 20001004_015404.jpg   Exif.CanonCs.MinAperture                     Short       1  F22
@@ -5038,7 +5038,7 @@ Compare image data and extracted data ------------------------------------
 > 20001004_015404.exv   Exif.CanonCs.AFPoint                         Short       1  Auto-selected
 > 20001004_015404.exv   Exif.CanonCs.ExposureProgram                 Short       1  Aperture priority (Av)
 > 20001004_015404.exv   Exif.CanonCs.0x0015                          Short       1  0
-> 20001004_015404.exv   Exif.CanonCs.LensType                        Short       1  Canon EF 28-70mm f/2.8L or Sigma or Tamron Lens
+> 20001004_015404.exv   Exif.CanonCs.LensType                        Short       1  Canon EF 28-70mm f/2.8L
 > 20001004_015404.exv   Exif.CanonCs.Lens                            Short       3  28.0 - 70.0 mm
 > 20001004_015404.exv   Exif.CanonCs.MaxAperture                     Short       1  F2.8
 > 20001004_015404.exv   Exif.CanonCs.MinAperture                     Short       1  F22
@@ -6799,7 +6799,7 @@ Compare original and inserted image data ---------------------------------
 < 20001004_015404.jpg   Exif.CanonCs.AFPoint                         Short       1  Auto-selected
 < 20001004_015404.jpg   Exif.CanonCs.ExposureProgram                 Short       1  Aperture priority (Av)
 < 20001004_015404.jpg   Exif.CanonCs.0x0015                          Short       1  0
-< 20001004_015404.jpg   Exif.CanonCs.LensType                        Short       1  Canon EF 28-70mm f/2.8L or Sigma or Tamron Lens
+< 20001004_015404.jpg   Exif.CanonCs.LensType                        Short       1  Canon EF 28-70mm f/2.8L
 < 20001004_015404.jpg   Exif.CanonCs.Lens                            Short       3  28.0 - 70.0 mm
 < 20001004_015404.jpg   Exif.CanonCs.MaxAperture                     Short       1  F2.8
 < 20001004_015404.jpg   Exif.CanonCs.MinAperture                     Short       1  F22
@@ -8340,7 +8340,7 @@ Compare original and inserted image data ---------------------------------
 > 20001004_015404.exv   Exif.CanonCs.AFPoint                         Short       1  Auto-selected
 > 20001004_015404.exv   Exif.CanonCs.ExposureProgram                 Short       1  Aperture priority (Av)
 > 20001004_015404.exv   Exif.CanonCs.0x0015                          Short       1  0
-> 20001004_015404.exv   Exif.CanonCs.LensType                        Short       1  Canon EF 28-70mm f/2.8L or Sigma or Tamron Lens
+> 20001004_015404.exv   Exif.CanonCs.LensType                        Short       1  Canon EF 28-70mm f/2.8L
 > 20001004_015404.exv   Exif.CanonCs.Lens                            Short       3  28.0 - 70.0 mm
 > 20001004_015404.exv   Exif.CanonCs.MaxAperture                     Short       1  F2.8
 > 20001004_015404.exv   Exif.CanonCs.MinAperture                     Short       1  F22

-- 
exiv2 packaging