From 1bd2463a2b76340ae356364dff944deba9774cfe Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 28 Jun 2016 20:30:42 +0200 Subject: libNX_X11 data files: Install libNX_X11 related data files. - Update XErrorDB to latest X.org version. - Install XErrorDB, XKeysymDB and Xcms.txt to /usr/{local/}share/nx/. - Assure that libNX_X11 finds those files at the named location. - Update debian/ packaging files. - Update nx-libs.spec packaging file. Fixes ArcticaProject/nx-libs#153 --- .../patches/016_nx-X11_install-location.debian.patch | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'debian/patches') 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 + + /* -- cgit v1.2.3