[X2go-Commits] nx-libs.git - master (branch) updated: 85be77cb3987999186be52686043c3f666d168dc

[X2go dev team]

The branch, master has been updated
       via  85be77cb3987999186be52686043c3f666d168dc (commit)
      from  f7e6c45a57014f5da840606204872b0ea3d70e28 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 85be77cb3987999186be52686043c3f666d168dc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Nov 19 17:36:45 2011 +0100

    Add patch: 003_nxcompshad-gcc43.patch

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                          |    1 +
 debian/patches/003_nxcompshad-gcc43.patch |   26 ++++++++++++++++++++++++++
 debian/patches/series                     |    1 +
 3 files changed, 28 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/003_nxcompshad-gcc43.patch

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index bbee930..cd45040 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,5 +5,6 @@ nx-libs (2:3.5.0-0~x2go1) UNRELEASED; urgency=low
   * Add quilt as build dependency.
   * Add main Makefile via patch: 001_add-main-makefile.patch.
   * Add patch: 002_nxcompshad-build-against-nx-x11-only.patch
+  * Add patch: 003_nxcompshad-gcc43.patch
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 14 Oct 2011 03:01:39 +0200
diff --git a/debian/patches/003_nxcompshad-gcc43.patch b/debian/patches/003_nxcompshad-gcc43.patch
new file mode 100644
index 0000000..c16a5c1
--- /dev/null
+++ b/debian/patches/003_nxcompshad-gcc43.patch
@@ -0,0 +1,26 @@
+--- a/nxcompshad/Logger.h
++++ b/nxcompshad/Logger.h
+@@ -18,8 +18,8 @@
+ #ifndef Logger_H
+ #define Logger_H
+ 
+-#include <errno.h>
+-#include <stdarg.h>
++#include <cerrno>
++#include <cstdarg>
+ 
+ //
+ // Error handling macros.
+--- a/nxcompshad/Misc.h
++++ b/nxcompshad/Misc.h
+@@ -20,8 +20,8 @@
+ 
+ #include <iostream>
+ 
+-#include <errno.h>
+-#include <string.h>
++#include <cerrno>
++#include <cstring>
+ 
+ using namespace std;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 84fa730..615573a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 001_add-main-makefile.patch
 002_nxcompshad-build-against-nx-x11-only.patch
+003_nxcompshad-gcc43.patch


hooks/post-receive
-- 
nx-libs.git (NX libraries)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX libraries).