[X2Go-Commits] nx-libs.git - build-baikal (branch) updated: nxproxy/3.5.0-1-179-g91ae4d4

[X2Go dev team]

The branch, build-baikal has been updated
       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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                            |    1 +
 debian/patches/011_nxcomp_sa-restorer.patch |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

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