[X2Go-Commits] nx-libs.git - build-main (branch) updated: redist-client/3.5.0.11-6-g22d41ae

X2Go dev team git-admin at x2go.org
Fri Aug 30 16:23:30 CEST 2013


The branch, build-main has been updated
       via  22d41ae20a02f10f7dd4245e426c0a007d42710c (commit)
      from  7e5c04b5db4e859b326ece329099d849906f2bb9 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                |    2 ++
 debian/patches/005_nxcomp_gcc43.full+lite.patch |   20 ++++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f865f72..a167637 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ nx-libs (2:3.5.0.12-0) UNRELEASED; urgency=low
   * Add patch: 051_nxcomp_macos105-fdisset.full+lite.patch, work around
     issue in Mac OS X 10.5 SDK. Pass address of fd_set structs on the stack
     to the FD_ISSET macro/function, instead of the struct itself.
+  * Update patch: 005_nxcomp_gcc43.full+lite.patch, fix faulty path to
+    nxcomp/Split.cpp.
 
   [ Oleksandr Shneyder ]
   * Create patch: 203_nxagent_disable-rootless-exit.full.patch.
diff --git a/debian/patches/005_nxcomp_gcc43.full+lite.patch b/debian/patches/005_nxcomp_gcc43.full+lite.patch
index 31cb984..bb758c2 100644
--- a/debian/patches/005_nxcomp_gcc43.full+lite.patch
+++ b/debian/patches/005_nxcomp_gcc43.full+lite.patch
@@ -5,8 +5,8 @@ Description: gcc43 fix
 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
+--- a/nxcomp/Message.cpp	2012-03-01 03:46:39.220943822 +0100
++++ b/nxcomp/Message.cpp	2012-03-01 03:47:27.605712530 +0100
 @@ -15,9 +15,9 @@
  /*                                                                        */
  /**************************************************************************/
@@ -19,8 +19,8 @@ Last-Update: 2011-12-31
  
  #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
+--- a/nxcomp/Misc.cpp	2012-03-01 03:46:39.220943822 +0100
++++ b/nxcomp/Misc.cpp	2012-03-01 03:47:27.605712530 +0100
 @@ -15,11 +15,11 @@
  /*                                                                        */
  /**************************************************************************/
@@ -37,8 +37,8 @@ Last-Update: 2011-12-31
  
  #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
+--- a/nxcomp/Misc.h	2012-03-01 03:46:39.220943822 +0100
++++ b/nxcomp/Misc.h	2012-03-01 03:47:27.605712530 +0100
 @@ -21,8 +21,8 @@
  #include <iostream>
  #include <fstream>
@@ -50,8 +50,8 @@ Last-Update: 2011-12-31
  
  #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
+--- a/nxcomp/Proxy.cpp	2012-03-01 03:46:39.224943897 +0100
++++ b/nxcomp/Proxy.cpp	2012-03-01 03:47:27.605712530 +0100
 @@ -15,9 +15,9 @@
  /*                                                                        */
  /**************************************************************************/
@@ -64,8 +64,8 @@ Last-Update: 2011-12-31
  #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
+--- a/nxcomp/Split.cpp	2012-03-01 03:46:39.224943897 +0100
++++ b/nxcomp/Split.cpp	2012-03-01 03:47:27.605712530 +0100
 @@ -16,7 +16,7 @@
  /**************************************************************************/
  


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

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




More information about the x2go-commits mailing list