[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=95ff809

The following commit has been merged in the master branch:
commit 95ff809f8fea8af5ba7fa4a26b435c31a15093ad
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Mar 19 10:06:44 2004 +0000

    More consistent output for exposure program settings
---
 src/canonmn.cpp | 8 ++++----
 src/fujimn.cpp  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 8c3aade..e1233b6 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -20,7 +20,7 @@
  */
 /*
   File:      canonmn.cpp
-  Version:   $Name:  $ $Revision: 1.3 $
+  Version:   $Name:  $ $Revision: 1.4 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   18-Feb-04, ahu: created
              07-Mar-04, ahu: isolated as a separate component
@@ -30,7 +30,7 @@
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.3 $ $RCSfile: canonmn.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.4 $ $RCSfile: canonmn.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -297,8 +297,8 @@ namespace Exif {
         switch (s) {
         case 0: os << "Easy shooting"; break;
         case 1: os << "Program"; break;
-        case 2: os << "Tv priority"; break;
-        case 3: os << "Av priority"; break;
+        case 2: os << "Shutter priority"; break;
+        case 3: os << "Aperture priority"; break;
         case 4: os << "Manual"; break;
         case 5: os << "A-DEP"; break;
         default: os << "(" << s << ")"; break;
diff --git a/src/fujimn.cpp b/src/fujimn.cpp
index b35c6ad..6108680 100644
--- a/src/fujimn.cpp
+++ b/src/fujimn.cpp
@@ -20,7 +20,7 @@
  */
 /*
   File:      fujimn.cpp
-  Version:   $Name:  $ $Revision: 1.1 $
+  Version:   $Name:  $ $Revision: 1.2 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   18-Feb-04, ahu: created
              07-Mar-04, ahu: isolated as a separate component
@@ -31,7 +31,7 @@
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.1 $ $RCSfile: fujimn.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.2 $ $RCSfile: fujimn.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -215,8 +215,8 @@ namespace Exif {
         case   4: os << "Sports"; break;
         case   5: os << "Night"; break;
         case   6: os << "Program"; break;
-        case 256: os << "Av priority"; break;
-        case 512: os << "Tv priority"; break;
+        case 256: os << "Aperture priority"; break;
+        case 512: os << "Shutter priority"; break;
         case 768: os << "Manual"; break;
         default: os << "(" << value << ")"; break;
         }

-- 
exiv2 packaging