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

The following commit has been merged in the master branch:
commit edb5c16a7fd7e627071843e95817cbbe125556f4
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Sep 22 14:24:51 2015 +0000

    #1109  Support for Visual Studio 2003/5/8/10/12/13/15
---
 src/version.cpp                     |   8 +++++++-
 website/{ => html}/Exiv2Logo.png    | Bin
 website/{ => html}/buildServer.html |   5 +++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/version.cpp b/src/version.cpp
index 3d4614b..40d7b18 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -198,8 +198,14 @@ void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys)
     "MSVC"    ;
 
 #ifndef __VERSION__
-    char version[20];
+    char  version[40];
     sprintf(version,"%d.%02d",(_MSC_VER-600)/100,_MSC_VER%100);
+
+    // add edition in brackets
+    int   edition             = (_MSC_VER-600)/100; // 7.1 = 2003 ... 14 = 2015
+    const char* editions[]    = { "2003", "2005", "2008", "2010", "2012","2013","no version 13","2015"};
+    if  ( edition < 7 || edition > 14 ) edition = 0 ;
+    if  ( edition ) sprintf(version+::strlen(version)," (%s)",editions[edition-7] );
 #define __VERSION__ version
 #endif
 
diff --git a/website/Exiv2Logo.png b/website/html/Exiv2Logo.png
similarity index 100%
rename from website/Exiv2Logo.png
rename to website/html/Exiv2Logo.png
diff --git a/website/buildServer.html b/website/html/buildServer.html
similarity index 97%
rename from website/buildServer.html
rename to website/html/buildServer.html
index aabcce5..1f5e94e 100644
--- a/website/buildServer.html
+++ b/website/html/buildServer.html
@@ -97,7 +97,7 @@ a:hover     { background-color  : cyan ; }
         if ( t('webready') ) s(['curl','libssh','openssl']);
 
         // estimate MSVC
-        var  m = t('2003') + t('2005') + t('2008') + t('2010') + t('2012') + t('2014'); // msvc builds
+        var  m = t('2003') + t('2005') + t('2008') + t('2010') + t('2012') + t('2013') + t('2015'); // msvc builds
         var  M = 4; // msvc build time
         if ( t('curl'   ) ) M += 5;
         if ( t('libssh' ) ) M += 1;
@@ -223,7 +223,8 @@ a:hover     { background-color  : cyan ; }
      <br><input type="checkbox" onclick="e()" name="2008"      >2008</input>
      <br><input type="checkbox" onclick="e()" name="2010"      >2010</input>
      <br><input type="checkbox" onclick="e()" name="2012"      >2012</input>
-     <br><input type="checkbox" onclick="e()" name="2014"      >2014</input>
+     <br><input type="checkbox" onclick="e()" name="2013"      >2013</input>
+     <br><input type="checkbox" onclick="e()" name="2015"      >2015</input>
   </td>
   <th>Link:</th>
      <td><input type="checkbox" onclick="e()" name="zlib"      >zlib</input>

-- 
exiv2 packaging