diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-04 22:55:23 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-04 22:55:23 +0200 |
| commit | e0edae04db6dc189512b3a1eda7fe4516af56512 (patch) | |
| tree | 70fb736ed560b4bd430b0ae5799fecbc3961c7e0 /debian | |
| parent | 27b0b5723ccbcc92bbcc80dff8fb698b69e74944 (diff) | |
| parent | 1bd2463a2b76340ae356364dff944deba9774cfe (diff) | |
| download | nx-libs-e0edae04db6dc189512b3a1eda7fe4516af56512.tar.gz nx-libs-e0edae04db6dc189512b3a1eda7fe4516af56512.tar.bz2 nx-libs-e0edae04db6dc189512b3a1eda7fe4516af56512.zip | |
Merge branch 'sunweaver-pr/xerrordb-from-xorg' into 3.6.x
Attributes GH PR #164: https://github.com/ArcticaProject/nx-libs/pull/164
Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Mon, 04 Jul 2016 13:43:08 -0700
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/nx-x11-common.install | 3 | ||||
| -rw-r--r-- | debian/patches/016_nx-X11_install-location.debian.patch | 20 |
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 + + /* |