aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/011_nxcomp_sa-restorer.patch8
2 files changed, 5 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 51f6bc49c..c3fc37dbd 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@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 de603d60d..afaa29fce 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@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__)