aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/nx-x11-common.install3
-rw-r--r--debian/patches/016_nx-X11_install-location.debian.patch20
2 files changed, 23 insertions, 0 deletions
diff --git a/debian/nx-x11-common.install b/debian/nx-x11-common.install
index b6fc46613..d3f7b4c3b 100644
--- a/debian/nx-x11-common.install
+++ b/debian/nx-x11-common.install
@@ -1 +1,4 @@
usr/share/nx/SecurityPolicy
+usr/share/nx/XErrorDB
+usr/share/nx/XKeysymDB
+usr/share/nx/Xcms.txt
diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch
index ddd92eeb3..ee5bb66cf 100644
--- a/debian/patches/016_nx-X11_install-location.debian.patch
+++ b/debian/patches/016_nx-X11_install-location.debian.patch
@@ -15,3 +15,23 @@ Last-Update: 2012-12-31
#ifndef AlternateUsrLibDir
#define AlternateUsrLibDir NO
#endif
+@@ -767,7 +767,7 @@
+ #define AlternateUsrDataDir YES
+ #endif
+ #else
+-#define UsrDataDir Concat4(/usr/local,/,share,/nx)
++#define UsrDataDir Concat4(/usr,/,share,/nx)
+ #ifndef AlternateUsrDataDir
+ #define AlternateUsrDataDir NO
+ #endif
+--- a/nx-X11/config/cf/site.def
++++ b/nx-X11/config/cf/site.def
+@@ -72,7 +72,7 @@
+ #ifdef AfterVendorCF
+
+ #ifndef ProjectRoot
+-#define ProjectRoot /usr/local
++#define ProjectRoot /usr
+ #endif
+
+ /*