aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-06-11 16:37:37 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-06-11 16:41:50 +0200
commite30d46d85367632d115e44d798a7663487a28670 (patch)
tree8036980f6189ea8f2069367b80441f30f7abf957 /debian
parent656f29cc631972002ec0fe1ee8f2ee53438f818d (diff)
downloadnx-libs-e30d46d85367632d115e44d798a7663487a28670.tar.gz
nx-libs-e30d46d85367632d115e44d798a7663487a28670.tar.bz2
nx-libs-e30d46d85367632d115e44d798a7663487a28670.zip
Make 016_nx-X11_install-location.debian.patch cleanly apply again.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/016_nx-X11_install-location.debian.patch2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 28deb7120..00640a23b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ nx-libs (2:3.5.0.25-0x2go1) UNRELEASED; urgency=low
available. (Fixes: #505).
* Make 220_nxproxy-bind-loopback-only.full+lite.patch cleanly apply after
having added 027_nxcomp_abstract-X11-socket.full+lite.patch.
+ * Make 016_nx-X11_install-location.debian.patch cleanly apply again.
* Add 028_nx-X11_abstract-kernel-sockets.full.patch. Provide abstract local
socket support for Linux based systems. This patch pulls in abstract
socket relevant code from xtrans 1.2.7. (Fixes: #504).
diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch
index 9d4fe1bf5..94e2cb075 100644
--- a/debian/patches/016_nx-X11_install-location.debian.patch
+++ b/debian/patches/016_nx-X11_install-location.debian.patch
@@ -6,7 +6,7 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Last-Update: 2012-12-31
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
-@@ -825,7 +825,7 @@
+@@ -829,7 +829,7 @@
#define AlternateUsrLibDir YES
#endif
#else