diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-12-14 01:08:34 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-12-14 01:08:34 +0100 |
| commit | 542b5b461b2ed67db51f33533e0b09959207eec7 (patch) | |
| tree | 2e49d01a86798b4a4359f8a4f27a0ac9b4fafc22 | |
| parent | f8b2a04e0a2d6edeafc8a604eed7a82170581f03 (diff) | |
| download | nx-libs-542b5b461b2ed67db51f33533e0b09959207eec7.tar.gz nx-libs-542b5b461b2ed67db51f33533e0b09959207eec7.tar.bz2 nx-libs-542b5b461b2ed67db51f33533e0b09959207eec7.zip | |
Add missing/renamed patches. (Ouch!).
| -rw-r--r-- | debian/patches/2001_nx-X11_install-location.debian.patch | 37 | ||||
| -rw-r--r-- | debian/patches/2002_xserver-xext_set-securitypolicy-path.debian.patch | 19 |
2 files changed, 56 insertions, 0 deletions
diff --git a/debian/patches/2001_nx-X11_install-location.debian.patch b/debian/patches/2001_nx-X11_install-location.debian.patch new file mode 100644 index 000000000..f71b0ace2 --- /dev/null +++ b/debian/patches/2001_nx-X11_install-location.debian.patch @@ -0,0 +1,37 @@ +Description: FHS adaptation for Debian packaging + On Debian, NX libraries and binaries are installed to + /usr/lib/nx. +Forwarded: not-needed +Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Last-Update: 2012-12-31 +--- a/nx-X11/config/cf/Imake.tmpl ++++ b/nx-X11/config/cf/Imake.tmpl +@@ -722,7 +722,7 @@ + #define AlternateUsrLibDir YES + #endif + #else +-#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx/X11) ++#define UsrLibDir Concat4(/usr,/,LibDirName,/nx/X11) + #ifndef AlternateUsrLibDir + #define AlternateUsrLibDir NO + #endif +@@ -740,7 +740,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 +@@ -69,7 +69,7 @@ + #ifdef AfterVendorCF + + #ifndef ProjectRoot +-#define ProjectRoot /usr/local ++#define ProjectRoot /usr + #endif + + /* diff --git a/debian/patches/2002_xserver-xext_set-securitypolicy-path.debian.patch b/debian/patches/2002_xserver-xext_set-securitypolicy-path.debian.patch new file mode 100644 index 000000000..b3186a9b4 --- /dev/null +++ b/debian/patches/2002_xserver-xext_set-securitypolicy-path.debian.patch @@ -0,0 +1,19 @@ +Description: FHS path fix for SecurityPolicy file + This patch is needed on Debian only, not reporting this path + change to upstream. + . + Originally contributed by Marcelo Boveto Shima <marceloshima@gmail.com>. +Forwarded: not-needed +Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Last-Update: 2012-01-12 +--- a/nx-X11/programs/Xserver/Xext/security.c ++++ b/nx-X11/programs/Xserver/Xext/security.c +@@ -84,7 +84,7 @@ + + #ifdef NXAGENT_SERVER + +-#define NX_ALTERNATIVEPOLICYFILE "/usr/local/share/nx/SecurityPolicy" ++#define NX_ALTERNATIVEPOLICYFILE "/usr/share/nx/SecurityPolicy" + + #endif + |