Merge remote branch 'origin/master'

debian/changelog

@@ -3,6 +3,7 @@ applauncherd (0.23.0) unstable; urgency=low
   * Changes: Removed extra prctl(PR_SET_DUMPABLE, ...)
   * Changes: e-booster refactoring
   * Changes: removed compilation warnings
+  * Fixes: NB#236033 - applauncherd does not build with gcc-4.5
 
  -- Alexey Shilov <alexey.shilov@nokia.com>  Thu, 10 Mar 2011 14:52:40 +0200
 

src/single-instance/main.cpp

@@ -29,6 +29,7 @@
 #include <sstream>
 #include <fstream>
 #include <iostream>
+#include <sys/stat.h> 
 
 #define DECL_EXPORT extern "C" __attribute__ ((__visibility__("default")))
 
@@ -337,7 +338,7 @@ int main(int argc, char **argv)
             if (execve(argv[1], argv + 1, environ) == -1)
             {
                 std::cerr << "ERROR!!: Failed to exec binary '" <<
-                    argv[1] << "̈́' : " << strerror(errno) << std::endl;
+                    argv[1] << "' : " << strerror(errno) << std::endl;
                 unlock();
                 
                 return EXIT_FAILURE;