aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2012-03-01 20:43:53 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-03-01 20:44:03 +0100
commit22d41ae20a02f10f7dd4245e426c0a007d42710c (patch)
tree0c776e497f6288a06fcfbe8062ee4ba135d2ce54
parent7e5c04b5db4e859b326ece329099d849906f2bb9 (diff)
downloadnx-libs-22d41ae20a02f10f7dd4245e426c0a007d42710c.tar.gz
nx-libs-22d41ae20a02f10f7dd4245e426c0a007d42710c.tar.bz2
nx-libs-22d41ae20a02f10f7dd4245e426c0a007d42710c.zip
Update patch: 005_nxcomp_gcc43.full+lite.patch, fix faulty path to nxcomp/Split.cpp.
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/005_nxcomp_gcc43.full+lite.patch20
2 files changed, 12 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog
index f865f72b9..a1676371b 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 31cb98484..bb758c2bd 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@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 @@
/**************************************************************************/