diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-28 20:30:42 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-04 16:39:19 +0200 |
| commit | 1bd2463a2b76340ae356364dff944deba9774cfe (patch) | |
| tree | 70fb736ed560b4bd430b0ae5799fecbc3961c7e0 /debian | |
| parent | 27b0b5723ccbcc92bbcc80dff8fb698b69e74944 (diff) | |
| download | nx-libs-1bd2463a2b76340ae356364dff944deba9774cfe.tar.gz nx-libs-1bd2463a2b76340ae356364dff944deba9774cfe.tar.bz2 nx-libs-1bd2463a2b76340ae356364dff944deba9774cfe.zip | |
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
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 + + /* |