Provide patches that are tarball / distro aware. Either NX (redistributed) has been installed to /usr/local/lib/nx via tarball or it has been packagedfor a distribution and is installed to /usr/lib/nx. Other installation paths are currently not supported.

10 files changed, 32 insertions, 22 deletions

diff --git a/debian/changelog b/debian/changelog
index d9d5db5cd..9d30af4e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,10 @@ nx-libs (2:3.5.0.2-1) UNRELEASED; urgency=low
     patch: 209_x2goagent-add-man-page.patch
   * Modify patch: 101_nxagent_set-rgb-path.patch, add path to RGB file
     if NX (redistributed) is installed via tarball under /usr/local.
+  * Provide patches that are tarball / distro aware. Either NX (redistributed)
+    has been installed to /usr/local/lib/nx via tarball or it has been packaged
+    for a distribution and is installed to /usr/lib/nx. Other installation paths
+    are currently not supported.
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Wed, 11 Jan 2012 15:30:36 +0100
 
diff --git a/debian/patches/016_nx-x11_install-location.patch b/debian/patches/016_nx-x11_install-location.patch
index 1bda0b08b..0231bcba7 100644
--- a/debian/patches/016_nx-x11_install-location.patch
+++ b/debian/patches/016_nx-x11_install-location.patch
@@ -1,6 +1,6 @@
 Description: FHS adaptation for Debian packaging
- On Debian, NX libraries and binaries are installed to
- /usr/lib/nx.
+ From tarball, NX libraries and binaries are installed to
+ /usr/local/lib/nx.
 Forwarded: not-needed
 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Last-Update: 2012-12-31
@@ -17,7 +17,7 @@ Last-Update: 2012-12-31
  #endif
  #else
 -#define UsrLibDir Concat3(/usr,/,LibDirName)
-+#define UsrLibDir Concat4(/usr,/,LibDirName,/nx)
++#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx)
  #ifndef AlternateUsrLibDir
  #define AlternateUsrLibDir NO
  #endif
diff --git a/debian/patches/019_nx-x11_expat-build-against-system-libxmltok.patch b/debian/patches/019_nx-x11_expat-build-against-system-libxmltok.patch
index bd0c72a7e..d32e570a3 100644
--- a/debian/patches/019_nx-x11_expat-build-against-system-libxmltok.patch
+++ b/debian/patches/019_nx-x11_expat-build-against-system-libxmltok.patch
@@ -13,7 +13,7 @@ Last-Update: 2011-12-31
  EXPATINC = $(EXPATTOP)/lib
  
 -INCLUDES = -I$(EXPATINC) -I$(EXPATTOP) -I.
-+INCLUDES = -I/usr/include/xmltok -I$(EXPATINC) -I$(EXPATTOP) -I. 
++INCLUDES = -I/usr/include/xmltok -I/usr/local/include/xmltok -I$(EXPATINC) -I$(EXPATTOP) -I. 
  
  /*
   * Endianness (for short's)
diff --git a/debian/patches/020_add-nxagent-wrapper.patch b/debian/patches/020_add-nxagent-wrapper.patch
index 93eb92a7f..f6a9a1d76 100644
--- a/debian/patches/020_add-nxagent-wrapper.patch
+++ b/debian/patches/020_add-nxagent-wrapper.patch
@@ -19,9 +19,10 @@
 +# along with this program.  If not, see http://www.gnu.org/licenses/.
 +
 +NX_LIBS=/usr/lib/nx
-+LD_LIBRARY_PATH=/usr/lib/nx:/usr/lib/nx/X11:$LD_LIBRARY_PATH
++NX_LOCAL_LIBS=/usr/local/lib/nx
++LD_LIBRARY_PATH=$NX_LIBS:$NX_LIBS/X11:$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$LD_LIBRARY_PATH
 +
-+export NX_LIBS
++test -d NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
 +export LD_LIBRARY_PATH
 +
-+exec /usr/lib/nx/nxagent "$@"
++exec $NX_LIBS/nxagent "$@"
diff --git a/debian/patches/021_add-nxauth-wrapper.patch b/debian/patches/021_add-nxauth-wrapper.patch
index ce51ea828..fea0b84f9 100644
--- a/debian/patches/021_add-nxauth-wrapper.patch
+++ b/debian/patches/021_add-nxauth-wrapper.patch
@@ -19,9 +19,10 @@
 +# along with this program.  If not, see http://www.gnu.org/licenses/.
 +
 +NX_LIBS=/usr/lib/nx
-+LD_LIBRARY_PATH=/usr/lib/nx:/usr/lib/nx/X11:$LD_LIBRARY_PATH
++NX_LOCAL_LIBS=/usr/local/lib/nx
++LD_LIBRARY_PATH=$NX_LIBS:$NX_LIBS/X11:$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$LD_LIBRARY_PATH
 +
-+export NX_LIBS
++test -d NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
 +export LD_LIBRARY_PATH
 +
-+exec /usr/lib/nx/nxauth "$@"
++exec $NX_LIBS/nxauth "$@"
diff --git a/debian/patches/022_add-nxproxy-wrapper.patch b/debian/patches/022_add-nxproxy-wrapper.patch
index cedfde399..53b0c2959 100644
--- a/debian/patches/022_add-nxproxy-wrapper.patch
+++ b/debian/patches/022_add-nxproxy-wrapper.patch
@@ -19,9 +19,10 @@
 +# along with this program.  If not, see http://www.gnu.org/licenses/.
 +
 +NX_LIBS=/usr/lib/nx
-+LD_LIBRARY_PATH=/usr/lib/nx:/usr/lib/nx/X11:$LD_LIBRARY_PATH
++NX_LOCAL_LIBS=/usr/local/lib/nx
++LD_LIBRARY_PATH=$NX_LIBS:$NX_LIBS/X11:$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$LD_LIBRARY_PATH
 +
-+export NX_LIBS
++test -d NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
 +export LD_LIBRARY_PATH
 +
-+exec /usr/lib/nx/nxproxy "$@"
++exec $NX_LIBS/nxproxy "$@"
diff --git a/debian/patches/023_add-x2goagent-wrapper.patch b/debian/patches/023_add-x2goagent-wrapper.patch
index ca53fdee0..ca7d92e9e 100644
--- a/debian/patches/023_add-x2goagent-wrapper.patch
+++ b/debian/patches/023_add-x2goagent-wrapper.patch
@@ -19,9 +19,10 @@
 +# along with this program.  If not, see http://www.gnu.org/licenses/.
 +
 +NX_LIBS=/usr/lib/nx
-+LD_LIBRARY_PATH=/usr/lib/nx:/usr/lib/nx/X11:$LD_LIBRARY_PATH
++NX_LOCAL_LIBS=/usr/local/lib/nx
++LD_LIBRARY_PATH=$NX_LIBS:$NX_LIBS/X11:$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$LD_LIBRARY_PATH
 +
-+export NX_LIBS
++test -d NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
 +export LD_LIBRARY_PATH
 +
-+exec /usr/lib/nx/x2goagent "$@"
++exec $NX_LIBS/../x2go/x2goagent "$@"
diff --git a/debian/patches/102_xserver-xext_set-securitypolicy-path.patch b/debian/patches/102_xserver-xext_set-securitypolicy-path.patch
index 4f43eeb37..9d27a372f 100644
--- a/debian/patches/102_xserver-xext_set-securitypolicy-path.patch
+++ b/debian/patches/102_xserver-xext_set-securitypolicy-path.patch
@@ -1,11 +1,11 @@
 Description: FHS path fix for SecurityPolicy file
- This patch is needed on Debian only, not reporting this path
- change to upstream.
+ This patch is needed for Tarball installation mode of NX (redistributed)
+ 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: 2011-12-31
+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 @@
@@ -13,7 +13,7 @@ Last-Update: 2011-12-31
  #ifdef NXAGENT_SERVER
  
 -#define NX_ALTERNATIVEPOLICYFILE "/usr/lib/xserver/SecurityPolicy"
-+#define NX_ALTERNATIVEPOLICYFILE "/usr/share/nx/SecurityPolicy"
++#define NX_ALTERNATIVEPOLICYFILE "/usr/local/share/nx/SecurityPolicy"
  
  #endif
  
diff --git a/debian/patches/103_nxagent_set-X0-config-path.patch b/debian/patches/103_nxagent_set-X0-config-path.patch
index 485f5fdc3..eb705ca81 100644
--- a/debian/patches/103_nxagent_set-X0-config-path.patch
+++ b/debian/patches/103_nxagent_set-X0-config-path.patch
@@ -1,6 +1,6 @@
 Description: FHS path fix for keyboard config file
- This patch is needed on Debian only, not reporting this path
- addition to upstream.
+ This patch is needed for Tarball installation and on Distros like
+ Debian, not reporting this path addition to upstream.
  .
  Originally contributed by FreeNX Team.
 Forwarded: not-needed
diff --git a/debian/patches/series b/debian/patches/series
index 26d3ee812..69901b29c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,6 +14,7 @@
 014_nxcompshad_makefile-uninstall.patch
 015_nxproxy_makefile-uninstall.patch
 016_nx-x11_install-location.patch
+016a_debian_nx-X11_install-location.patch
 017_nx-x11_update-autotools-helper-files.patch
 018_nx-x11_update-libtool-ltmain-script.patch
 019_nx-x11_expat-build-against-system-libxmltok.patch
@@ -23,6 +24,7 @@
 023_add-x2goagent-wrapper.patch
 101_nxagent_set-rgb-path.patch
 102_xserver-xext_set-securitypolicy-path.patch
+102a_debian_xserver-xext_set-securitypolicy-path.patch
 103_nxagent_set-X0-config-path.patch
 105_nxagent_export-remote-keyboard-config.patch
 106_nxagent_utf8-copy-clipboard.patch