aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--debian/patches/032_no-x11r6.full.patch24
-rw-r--r--debian/patches/series1
3 files changed, 29 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 0b45f2f5c..49612d969 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,10 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
* Add patch: 031_nx-X11_parallel-make.diff, enable parallel make.
* Add patch: 301_nx-X11_use-shared-libs.full.diff, use shared libraries from
distribution rather then libs included in source tree.
+ * Add patch 032_nx-X11_no-x11r6-project-root. We must not overlap with any
+ existing files, therefore, both /usr/X11R6 and /usr are excluded
+ possibilities for ProjectRoot. Use %_libexecdir/somename, since that is
+ still allowed by FHS.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Feb 2012 13:48:19 +0100
diff --git a/debian/patches/032_no-x11r6.full.patch b/debian/patches/032_no-x11r6.full.patch
new file mode 100644
index 000000000..97ce88c51
--- /dev/null
+++ b/debian/patches/032_no-x11r6.full.patch
@@ -0,0 +1,24 @@
+Description: No X11R6 Project Root
+ We must not overlap with any existing files, therefore, both
+ /usr/X11R6 and /usr are excluded possibilities for ProjectRoot.
+ Use %_libexecdir/somename, since that is still allowed by FHS.
+Forward: pending
+Author: Jan Engelhardt <jengelh@medozas.de>
+Last-Update: 2012-01-27 01:35:49.164415307 +0100
+---
+ nx-X11/config/cf/site.def | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: nx-X11/config/cf/site.def
+===================================================================
+--- a/nx-X11/config/cf/site.def
++++ b/nx-X11/config/cf/site.def
+@@ -72,7 +72,7 @@ XCOMM site: $XFree86: xc/config/cf/site
+ #ifdef AfterVendorCF
+
+ #ifndef ProjectRoot
+-#define ProjectRoot /usr/X11R6
++#define ProjectRoot /usr/lib/NX3
+ #endif
+
+ /*
diff --git a/debian/patches/series b/debian/patches/series
index 8f1a38810..d5d95137c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,6 +25,7 @@
023_add-x2goagent-wrapper.full.patch
030_nx-X11_configure-args.full.diff
031_nx-X11_parallel-make.full.diff
+032_no-x11r6.full.patch
101_nxagent_set-rgb-path.full.patch
102_xserver-xext_set-securitypolicy-path.full.patch
102_xserver-xext_set-securitypolicy-path.debian.patch