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

The following commit has been merged in the master branch:
commit ca8f413673c43cb921917c625c148683164456da
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Nov 14 08:49:45 2012 +0000

    Windows fixes for exiv2 -v -V output
---
 src/version.cpp | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/version.cpp b/src/version.cpp
index 1fefa35..096725d 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -130,7 +130,7 @@ EXIV2API void dumpLibraryInfo(std::ostream& os)
 {
 	  string_v libs; // libs[0] == executable
 
-	  int      bits     = sizeof(void*);
+	  int      bits = sizeof(void*);
 #if   defined(_DEBUG) || defined(DEBUG)
 	  int debug=1;
 #else
@@ -145,15 +145,30 @@ EXIV2API void dumpLibraryInfo(std::ostream& os)
 
       const char* compiler = 
 #if   defined(_MSC_VER)
-	  "MSVC"    ; // ((_MSC_VER-600)/100),debug,dll,bits);
+	  "MSVC"    ;
+
+#ifndef __VERSION__
+	  char version[20];
+	  sprintf(version,"%d.%02d",(_MSC_VER-600)/100,_MSC_VER%100);
+#define __VERSION__ version
+#endif
+
 #elif defined(__clang__)
-	  "Clang"   ; // =%s,DEBUG=%d,DLL=%d,Bits=%d"  ,__clang_version__,debug,dll,bits);
+	  "Clang"   ;
 #elif defined(__GNUG__)
-	  "G++"     ; // =%s,DEBUG=%d,DLL=%d,Bits=%d"    ,__VERSION__,debug,dll,bits);
+	  "G++"     ;
 #elif defined(__GNUC__)
-	  "GCC"     ; // =%s,DEBUG=%d,DLL=%d,Bits=%d"    ,__VERSION__,debug,dll,bits);
+	  "GCC"     ;
 #else
-	  "unknown" ; // =%s,DEBUG=%d,DLL=%d,Bits=%d",__VERSION__,debug,dll,bits);
+	  "unknown" ;
+#endif
+
+#ifndef __VERSION__
+#ifdef  __clang__version__
+#define __VERSION__ __clang__version__
+#else
+#define __VERSION__ "unknown"
+#endif
 #endif
 
 	  const char* platform =

-- 
exiv2 packaging