[X2go-Commits] nx-libs.git - master (branch) updated: redist-server/3.5.0.6-1-g1bd66f1

[X2go dev team]

The branch, master has been updated
       via  1bd66f19cca344557602aa3640b32e747980f8d3 (commit)
      from  28b2a3a93daaa29a2635fb8ae670eccfe772e3d8 (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 1bd66f19cca344557602aa3640b32e747980f8d3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jan 16 10:54:19 2012 +0100

    Drop patch: 011_nxcomp_sa-restorer.patch.

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

Summary of changes:
 debian/changelog                            |    6 ++++++
 debian/patches/011_nxcomp_sa-restorer.patch |   25 -------------------------
 debian/patches/series                       |    1 -
 3 files changed, 6 insertions(+), 26 deletions(-)
 delete mode 100644 debian/patches/011_nxcomp_sa-restorer.patch

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d979930..d9c487d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nx-libs (2:3.5.0.7-0) UNRELEASED; urgency=low
+
+  * Drop patch: 011_nxcomp_sa-restorer.patch.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 16 Jan 2012 10:38:53 +0100
+
 nx-libs (2:3.5.0.6-0) unstable; urgency=low
 
   * Add patch: 202_nx-x11_enable-xinerama.patch.
diff --git a/debian/patches/011_nxcomp_sa-restorer.patch b/debian/patches/011_nxcomp_sa-restorer.patch
deleted file mode 100644
index afaa29f..0000000
--- a/debian/patches/011_nxcomp_sa-restorer.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: sa_restorer vs. memset
- Use memset instead of setting .sa_restorer to NULL.
-Forwarded: not-yet
-Author: Stéphane Graber <stgraber at ubuntu.com>
-Last-Update: 2011-12-31
---- a/nxcomp/Loop.cpp
-+++ b/nxcomp/Loop.cpp
-@@ -5895,7 +5895,7 @@
- 
-   #if defined(__linux__)
- 
--  newAction.sa_restorer = NULL;
-+  memset(&newAction, NULL, sizeof(newAction));
- 
-   #endif
- 
-@@ -6513,7 +6513,7 @@
- 
-   #if defined(__linux__)
- 
--  action.sa_restorer = NULL;
-+  memset(&action, NULL, sizeof(action));
- 
-   #endif
- 
diff --git a/debian/patches/series b/debian/patches/series
index 8b57972..52558c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,7 +8,6 @@
 009_nxproxy-add-man-page.patch
 009_nxagent-add-man-page.patch
 010_nxauth_fix-binary-name-in-man-page.patch
-011_nxcomp_sa-restorer.patch
 012_nxcomp_makefile-uninstall.patch
 013_nxcompext_makefile-uninstall.patch
 014_nxcompshad_makefile-uninstall.patch


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