diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-01-12 13:01:04 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-01-12 13:01:04 +0100 |
| commit | df8dc83d1341aeec42f488bec79bca95db438b8f (patch) | |
| tree | 08ab7d72795c51e615e00fbc90a963a4b7a4e663 | |
| parent | 760c5c07c63798e0e065020456e7514c8dd8b72d (diff) | |
| download | nx-libs-df8dc83d1341aeec42f488bec79bca95db438b8f.tar.gz nx-libs-df8dc83d1341aeec42f488bec79bca95db438b8f.tar.bz2 nx-libs-df8dc83d1341aeec42f488bec79bca95db438b8f.zip | |
two more patches belonging to last commit: 016a_debian_nx-X11_install-location.patch, 102a_debian_xserver-xext_set-securitypolicy-path.patch
| -rw-r--r-- | debian/patches/016a_debian_nx-X11_install-location.patch | 17 | ||||
| -rw-r--r-- | debian/patches/102a_debian_xserver-xext_set-securitypolicy-path.patch | 19 |
2 files changed, 36 insertions, 0 deletions
diff --git a/debian/patches/016a_debian_nx-X11_install-location.patch b/debian/patches/016a_debian_nx-X11_install-location.patch new file mode 100644 index 000000000..9d4fe1bf5 --- /dev/null +++ b/debian/patches/016a_debian_nx-X11_install-location.patch @@ -0,0 +1,17 @@ +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 +@@ -825,7 +825,7 @@ + #define AlternateUsrLibDir YES + #endif + #else +-#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx) ++#define UsrLibDir Concat4(/usr,/,LibDirName,/nx) + #ifndef AlternateUsrLibDir + #define AlternateUsrLibDir NO + #endif diff --git a/debian/patches/102a_debian_xserver-xext_set-securitypolicy-path.patch b/debian/patches/102a_debian_xserver-xext_set-securitypolicy-path.patch new file mode 100644 index 000000000..0d11f2f0a --- /dev/null +++ b/debian/patches/102a_debian_xserver-xext_set-securitypolicy-path.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 +@@ -86,7 +86,7 @@ + + #ifdef NXAGENT_SERVER + +-#define NX_ALTERNATIVEPOLICYFILE "/usr/local/share/nx/SecurityPolicy" ++#define NX_ALTERNATIVEPOLICYFILE "/usr/share/nx/SecurityPolicy" + + #endif + |