[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=9c5588c

The following commit has been merged in the master branch:
commit 9c5588c9ddba3cb033d95d1615e3ebb0564d5bfa
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Jun 30 05:39:23 2004 +0000

    Use PACKAGE_STRING from config.h for version
---
 src/exiv2.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/exiv2.cpp b/src/exiv2.cpp
index e9f0739..48bae38 100644
--- a/src/exiv2.cpp
+++ b/src/exiv2.cpp
@@ -22,16 +22,18 @@
   Abstract:  Command line program to display and manipulate image %Exif data
 
   File:      exiv2.cpp
-  Version:   $Name:  $ $Revision: 1.9 $
+  Version:   $Name:  $ $Revision: 1.10 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   10-Dec-03, ahu: created
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.9 $ $RCSfile: exiv2.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.10 $ $RCSfile: exiv2.cpp,v $")
 
 // *****************************************************************************
 // included header files
+#include <config.h>
+
 #include "exiv2.hpp"
 #include "actions.hpp"
 #include "utils.hpp"
@@ -105,7 +107,7 @@ Params& Params::instance()
 
 void Params::version(std::ostream& os) const
 {
-    os << "Exiv2 version 0.4-pre1, " 
+    os << PACKAGE_STRING << ", " 
        << "Copyright (C) 2004 Andreas Huggel.

"
        << "This is free software; see the source for copying conditions.  "
        << "There is NO 
warranty; not even for MERCHANTABILITY or FITNESS FOR "

-- 
exiv2 packaging