[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=cf927ed

The following commit has been merged in the master branch:
commit cf927ed2c8ec635980af2b5b3eff23d56b535f1f
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Dec 5 17:25:11 2015 +0000

    #1121 (msvc support for v0.26).  exiv2 -vVg ^version reports version=8.00 (2005/x64) or version=8.00 (2005/x86) instead of version=8.00 (2005)
---
 src/version.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/version.cpp b/src/version.cpp
index dbda9a2..55fb2e6 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -231,7 +231,7 @@ void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys)
     size_t      edition       = (_MSC_VER-600)/100;
     const char* editions[]    = { "0","1","2","3","4","5","6","2003", "2005", "2008", "2010", "2012","2013","2015"};
     if  ( edition > lengthof(editions) ) edition = 0 ;
-    if  ( edition ) sprintf(version+::strlen(version)," (%s)",editions[edition] );
+    if  ( edition ) sprintf(version+::strlen(version)," (%s/%s)",editions[edition],bits==64?"x64":"x86");
 #define __VERSION__ version
 #endif
 

-- 
exiv2 packaging