[X2Go-Commits] nx-libs.git - build-baikal (branch) updated: redist-server/3.5.0.2-13-gdf8dc83

X2Go dev team git-admin at x2go.org
Fri Aug 30 16:24:53 CEST 2013


The branch, build-baikal has been updated
       via  df8dc83d1341aeec42f488bec79bca95db438b8f (commit)
      from  760c5c07c63798e0e065020456e7514c8dd8b72d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../016a_debian_nx-X11_install-location.patch      |   17 +++++++++++++++++
 ...ian_xserver-xext_set-securitypolicy-path.patch} |    8 ++++----
 2 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 debian/patches/016a_debian_nx-X11_install-location.patch
 copy debian/patches/{102_xserver-xext_set-securitypolicy-path.patch => 102a_debian_xserver-xext_set-securitypolicy-path.patch} (59%)

The diff of changes is:
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 0000000..9d4fe1b
--- /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 at 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/102_xserver-xext_set-securitypolicy-path.patch b/debian/patches/102a_debian_xserver-xext_set-securitypolicy-path.patch
similarity index 59%
copy from debian/patches/102_xserver-xext_set-securitypolicy-path.patch
copy to debian/patches/102a_debian_xserver-xext_set-securitypolicy-path.patch
index 9d27a37..0d11f2f 100644
--- a/debian/patches/102_xserver-xext_set-securitypolicy-path.patch
+++ b/debian/patches/102a_debian_xserver-xext_set-securitypolicy-path.patch
@@ -1,6 +1,6 @@
 Description: FHS path fix for SecurityPolicy file
- This patch is needed for Tarball installation mode of NX (redistributed)
- only, not reporting this path change to upstream.
+ This patch is needed on Debian only, not reporting this path
+ change to upstream.
  .
  Originally contributed by Marcelo Boveto Shima <marceloshima at gmail.com>.
 Forwarded: not-needed
@@ -12,8 +12,8 @@ Last-Update: 2012-01-12
  
  #ifdef NXAGENT_SERVER
  
--#define NX_ALTERNATIVEPOLICYFILE "/usr/lib/xserver/SecurityPolicy"
-+#define NX_ALTERNATIVEPOLICYFILE "/usr/local/share/nx/SecurityPolicy"
+-#define NX_ALTERNATIVEPOLICYFILE "/usr/local/share/nx/SecurityPolicy"
++#define NX_ALTERNATIVEPOLICYFILE "/usr/share/nx/SecurityPolicy"
  
  #endif
  


hooks/post-receive
-- 
nx-libs.git (NX (redistributed))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).




More information about the x2go-commits mailing list