[X2go-Commits] nx-libs.git - master (branch) updated: nxproxy/3.5.0-1-180-ge292f23

[X2go dev team]

The branch, master has been updated
       via  e292f23ac050d7c5be7e9e8328290d5a106362d0 (commit)
       via  91ae4d4e400bfb18f5e89dd4ecf8b9cede931fcc (commit)
      from  b494b528745c741d230e877098f5c191910cdcaa (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 e292f23ac050d7c5be7e9e8328290d5a106362d0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 31 18:32:01 2011 +0100

    forgot to add patch file: 005_nxcomp_gcc43.patch

commit 91ae4d4e400bfb18f5e89dd4ecf8b9cede931fcc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 31 18:31:40 2011 +0100

    Fix line hunks: 011_nxcomp_sa-restorer.patch.

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

Summary of changes:
 debian/changelog                            |    1 +
 debian/patches/005_nxcomp_gcc43.patch       |   77 +++++++++++++++++++++++++++
 debian/patches/011_nxcomp_sa-restorer.patch |    8 ++--
 3 files changed, 82 insertions(+), 4 deletions(-)
 create mode 100644 debian/patches/005_nxcomp_gcc43.patch

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 51f6bc4..c3fc37d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -77,6 +77,7 @@ nx-libs (2:3.5.0-2) UNRELEASED; urgency=low
     in /debian/man.
   * Add patch: 011_nxcomp_sa-restorer.patch.
   * Add/insert patch: 005_nxcomp_gcc43.patch.
+  * Fix line hunks: 011_nxcomp_sa-restorer.patch.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 28 Dec 2011 19:06:26 +0100
 
diff --git a/debian/patches/005_nxcomp_gcc43.patch b/debian/patches/005_nxcomp_gcc43.patch
new file mode 100644
index 0000000..31cb984
--- /dev/null
+++ b/debian/patches/005_nxcomp_gcc43.patch
@@ -0,0 +1,77 @@
+Description: gcc43 fix
+ Use builtin includes to build with gcc43.
+ .
+ Originally contributed by Marcelo Boveto Shima <marceloshima at gmail.com>.
+Forwarded: not-yet
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Last-Update: 2011-12-31
+--- a/nxcomp/Message.cpp      2010-03-18 19:32:44.476930493 -0300
++++ b/nxcomp/Message.cpp   2010-03-18 19:40:48.669719034 -0300
+@@ -15,9 +15,9 @@
+ /*                                                                        */
+ /**************************************************************************/
+ 
+-#include <stdio.h>
++#include <cstdio>
+ #include <unistd.h>
+-#include <string.h>
++#include <cstring>
+ 
+ #include <algorithm>
+ 
+--- a/nxcomp/Misc.cpp 2010-03-18 19:32:44.488465101 -0300
++++ b/nxcomp/Misc.cpp      2010-03-18 19:40:48.669719034 -0300
+@@ -15,11 +15,11 @@
+ /*                                                                        */
+ /**************************************************************************/
+ 
+-#include <stdio.h>
+-#include <ctype.h>
+-#include <stdlib.h>
++#include <cstdio>
++#include <cctype>
++#include <cstdlib>
+ #include <unistd.h>
+-#include <signal.h>
++#include <csignal>
+ 
+ #include <errno.h>
+ #include <string.h>
+--- a/nxcomp/Misc.h   2010-03-18 19:32:44.488465101 -0300
++++ b/nxcomp/Misc.h        2010-03-18 19:40:48.669719034 -0300
+@@ -21,8 +21,8 @@
+ #include <iostream>
+ #include <fstream>
+ 
+-#include <errno.h>
+-#include <string.h>
++#include <cerrno>
++#include <cstring>
+ 
+ #ifdef __sun
+ 
+--- a/nxcomp/Proxy.cpp        2010-03-18 19:32:44.547273410 -0300
++++ b/nxcomp/Proxy.cpp     2010-03-18 19:40:48.669719034 -0300
+@@ -15,9 +15,9 @@
+ /*                                                                        */
+ /**************************************************************************/
+ 
+-#include <stdio.h>
++#include <cstdio>
+ #include <unistd.h>
+-#include <stdlib.h>
++#include <cstdlib>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
+--- a/nxcomp/Split.cpp        2010-03-18 19:32:44.688465322 -0300
++++ nxcomp-ubuntu/Split.cpp     2010-03-18 19:40:48.669719034 -0300
+@@ -16,7 +16,7 @@
+ /**************************************************************************/
+ 
+ #include <unistd.h>
+-#include <string.h>
++#include <cstring>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <utime.h>
diff --git a/debian/patches/011_nxcomp_sa-restorer.patch b/debian/patches/011_nxcomp_sa-restorer.patch
index de603d6..afaa29f 100644
--- a/debian/patches/011_nxcomp_sa-restorer.patch
+++ b/debian/patches/011_nxcomp_sa-restorer.patch
@@ -3,9 +3,9 @@ Description: sa_restorer vs. memset
 Forwarded: not-yet
 Author: Stéphane Graber <stgraber at ubuntu.com>
 Last-Update: 2011-12-31
---- a/Loop.cpp
-+++ b/Loop.cpp
-@@ -5895,7 +5895,7 @@ void InstallSignal(int signal, int action)
+--- a/nxcomp/Loop.cpp
++++ b/nxcomp/Loop.cpp
+@@ -5895,7 +5895,7 @@
  
    #if defined(__linux__)
  
@@ -14,7 +14,7 @@ Last-Update: 2011-12-31
  
    #endif
  
-@@ -6513,7 +6513,7 @@ void SetTimer(int value)
+@@ -6513,7 +6513,7 @@
  
    #if defined(__linux__)
  


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).