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

The following commit has been merged in the master branch:
commit b1b42d8e1565196b38efdaeb463d800e8ec57d07
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Jan 2 12:15:20 2016 +0000

    #1147.  Correction to r4159 for linux build breaker (linux doesn't have include uuid/uuid.h)
---
 src/version.cpp | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/version.cpp b/src/version.cpp
index 613e35e..0f08938 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -33,11 +33,6 @@ EXIV2_RCSID("@(#) $Id$")
 
 #include "config.h"
 
-// #1147
-#ifndef _MSC_VER
-#include <uuid/uuid.h>
-#endif
-
 #ifndef EXV_USE_SSH
 #define EXV_USE_SSH 0
 #endif
@@ -550,14 +545,13 @@ void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys)
 
 // #1147
 #ifndef _MSC_VER
-    uuid_t* p_uid ;
-	uid_t uid = getuid()   ; uuid_string_t s_uid ; p_uid= (uuid_t*) &uid ; uuid_unparse(*p_uid,s_uid);
-    uid_t eid = geteuid()  ; uuid_string_t s_eid ; p_uid= (uuid_t*) &eid ; uuid_unparse(*p_uid,s_eid);
-    uid_t gid = getgid()   ; uuid_string_t s_gid ; p_uid= (uuid_t*) &gid ; uuid_unparse(*p_uid,s_gid);
-
-    output(os,keys,"uid"               , s_uid           );
-    output(os,keys,"euid"              , s_eid           );
-    output(os,keys,"gid"               , s_gid           );
+    uid_t uid  = getuid()  ;
+    uid_t euid = geteuid() ;
+    uid_t gid  = getgid()  ;
+
+    output(os,keys,"uid"               , uid           );
+    output(os,keys,"euid"              , euid          );
+    output(os,keys,"gid"               , gid           );
 #endif
 
     output(os,keys,"have_regex"        ,have_regex       );

-- 
exiv2 packaging