[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=2ae0bcf

The following commit has been merged in the master branch:
commit 2ae0bcf7b89cc1b8cf69e3282d7ad59bd5498d0e
Author: vog <vog at notjusthosting.com>
Date:   Mon Aug 22 21:56:49 2011 +0000

    Added version hex number to the output of "exiv2 -V"
---
 src/exiv2.cpp            | 4 ++--
 test/data/exiv2-test.out | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/exiv2.cpp b/src/exiv2.cpp
index 558195c..2d03d1f 100644
--- a/src/exiv2.cpp
+++ b/src/exiv2.cpp
@@ -206,8 +206,8 @@ void Params::cleanup()
 void Params::version(std::ostream& os) const
 {
     bool  b64    = sizeof(void*)==8;
-    const char* sBuild = b64 ? " (64 bit build)" : " (32 bit build)" ;
-    os << EXV_PACKAGE_STRING << sBuild << "
"
+    const char* sBuild = b64 ? "(64 bit build)" : "(32 bit build)" ;
+    os << EXV_PACKAGE_STRING << " " << Exiv2::versionNumberHexString() << " " << sBuild << "
"
        << _("Copyright (C) 2004-2011 Andreas Huggel.
")
        << "
"
        << _("This program is free software; you can redistribute it and/or
"
diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index 5f478f4..eb23bb6 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -2,7 +2,7 @@ Exiv2 test directory -----------------------------------------------------
 tmp/
 
 Exiv2 version ------------------------------------------------------------
-exiv2 0.21.1 (__ bit build)
+exiv2 0.21.1 001501 (__ bit build)
 Copyright (C) 2004-2011 Andreas Huggel.
 
 This program is free software; you can redistribute it and/or

-- 
exiv2 packaging