aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/011_nxcomp_sa-restorer.patch25
-rw-r--r--debian/patches/series1
3 files changed, 6 insertions, 26 deletions
diff --git a/debian/changelog b/debian/changelog
index d979930d8..d9c487de3 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@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 afaa29fce..000000000
--- 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@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 8b5797289..52558c076 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