Drop patch 032, fix other patches so that installation via make install installs NX components to /usr/local/lib/nx and /usr/local/include/nx.

16 files changed, 135 insertions, 48 deletions

diff --git a/debian/changelog b/debian/changelog
index 65fc3c7b7..5462b6cc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ nx-libs (2:3.5.0.16-0) UNRELEASED; urgency=low
   * Fix patch file names concerning component nx-X11.
   * Modify patch: 032_no-x11r6.full.patch. Install nx-X11 to /usr/local/lib/nx.
   * Add patch: 032_no-x11r6.debian.patch. Use /usr/lib/nx for nx-X11 on Debian.
+  * Drop patch 032, fix other patches so that installation via make install
+    installs NX components to /usr/local/lib/nx and /usr/local/include/nx.
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Fri, 21 Sep 2012 10:06:54 +0200
 
diff --git a/debian/nxagent.dirs b/debian/nxagent.dirs
index 25db3d713..544d2fa34 100644
--- a/debian/nxagent.dirs
+++ b/debian/nxagent.dirs
@@ -1,3 +1,3 @@
 usr/bin
-usr/lib/nx
+usr/lib/nx/bin
 usr/share/nx
\ No newline at end of file
diff --git a/debian/nxagent.install b/debian/nxagent.install
index 76b62fc1c..6d1e230a5 100644
--- a/debian/nxagent.install
+++ b/debian/nxagent.install
@@ -1,4 +1,4 @@
-nx-X11/programs/Xserver/nxagent                usr/lib/nx
+nx-X11/programs/Xserver/nxagent                usr/lib/nx/bin
 bin/nxagent                                    usr/bin
 debian/rgb                                     usr/share/nx
 debian/nxagent.keyboard                        etc/nxagent
diff --git a/debian/nxauth.dirs b/debian/nxauth.dirs
index 4330badaf..7c8e1505c 100644
--- a/debian/nxauth.dirs
+++ b/debian/nxauth.dirs
@@ -1,2 +1,2 @@
 usr/bin
-usr/lib/nx
+usr/lib/nx/bin
diff --git a/debian/nxauth.install b/debian/nxauth.install
index 52d801c6b..94e40356c 100644
--- a/debian/nxauth.install
+++ b/debian/nxauth.install
@@ -1,2 +1,2 @@
-nx-X11/programs/nxauth/nxauth                    usr/lib/nx/
+nx-X11/programs/nxauth/nxauth                    usr/lib/nx/bin
 bin/nxauth                                       usr/bin
diff --git a/debian/nxproxy.dirs b/debian/nxproxy.dirs
index 4330badaf..7c8e1505c 100644
--- a/debian/nxproxy.dirs
+++ b/debian/nxproxy.dirs
@@ -1,2 +1,2 @@
 usr/bin
-usr/lib/nx
+usr/lib/nx/bin
diff --git a/debian/nxproxy.install b/debian/nxproxy.install
index 42a49f25b..7b2af0fbb 100644
--- a/debian/nxproxy.install
+++ b/debian/nxproxy.install
@@ -1,3 +1,3 @@
-nxproxy/nxproxy                    usr/lib/nx
+nxproxy/nxproxy                    usr/lib/nx/bin
 bin/nxproxy                        usr/bin
 
diff --git a/debian/patches/016_nx-X11_install-location.full.patch b/debian/patches/016_nx-X11_install-location.full.patch
index 0231bcba7..6571aea9e 100644
--- a/debian/patches/016_nx-X11_install-location.full.patch
+++ b/debian/patches/016_nx-X11_install-location.full.patch
@@ -30,3 +30,125 @@ Last-Update: 2012-12-31
  #ifndef AlternateIncRoot
  #define AlternateIncRoot YES
  #endif
+--- a/nx-X11/config/cf/X11.rules
++++ b/nx-X11/config/cf/X11.rules
+@@ -36,17 +36,17 @@
+ #endif
+ 
+ #if defined(X11ProjectRoot)
+-# define XBinDir	$(XPROJECTROOT)/bin
++# define XBinDir	$(XPROJECTROOT)/lib/nx/bin
+ #elif defined(ProjectRoot) 
+-# define XBinDir	$(PROJECTROOT)/bin
++# define XBinDir	$(PROJECTROOT)/lib/nx/bin
+ #else
+ # define XBinDir	$(BINDIR)
+ #endif
+ 
+ #ifdef X11ProjectRoot
+-# define XUsrLibDirPath	$(USRLIBDIR):$(XPROJECTROOT)/lib
++# define XUsrLibDirPath	$(USRLIBDIR)/nx:$(XPROJECTROOT)
+ #else
+-# define XUsrLibDirPath	$(USRLIBDIR)
++# define XUsrLibDirPath	$(USRLIBDIR)/nx
+ #endif
+ #ifdef UsrLibDirPath
+ # undef UsrLibDirPath
+@@ -60,7 +60,7 @@
+ #if ImportX11
+ # define XLdPreLibs	-L$(LIBSRC)
+ #elif defined(UseInstalledX11) && defined(X11ProjectRoot)
+-# define XLdPreLibs	-L$(XPROJECTROOT)/lib
++# define XLdPreLibs	-L$(XPROJECTROOT)
+ #else
+ # define XLdPreLibs	/**/
+ #endif
+@@ -70,7 +70,7 @@
+ #define LdPreLibs	LdPreLib XLdPreLibs
+ 
+ #ifdef X11ProjectRoot
+-# define XLdPostLibs	-L$(XPROJECTROOT)/lib
++# define XLdPostLibs	-L$(XPROJECTROOT)
+ #else
+ # define XLdPostLibs	/**/
+ #endif
+@@ -86,7 +86,7 @@
+ #  define TopXInclude	-I$(TOP)/exports/include
+ #else
+ #  ifdef X11ProjectRoot
+-#   define TopXInclude	-I$(XPROJECTROOT)/include
++#   define TopXInclude	-I$(XPROJECTROOT)/../../include/nx
+ #  else
+ #   define TopXInclude	/**/
+ #  endif
+@@ -98,7 +98,7 @@
+ #define TopIncludes	TopInclude $(TOP_X_INCLUDES)
+ 
+ #if UseInstalledX11 && defined(X11ProjectRoot)
+-# define X11BuildLibPath	$(XPROJECTROOT)/lib
++# define X11BuildLibPath	$(XPROJECTROOT)
+ #elif UseInstalledX11
+ # define X11BuildLibPath	$(USRLIBDIR)
+ #elif ImportX11
+--- a/nx-X11/config/cf/X11.tmpl
++++ b/nx-X11/config/cf/X11.tmpl
+@@ -1401,7 +1401,7 @@
+ 
+ #ifndef BinDir
+ #ifdef ProjectRoot
+-#define BinDir Concat(ProjectRoot,/bin)
++#define BinDir Concat(ProjectRoot,/lib/nx/bin)
+ #else
+ #define BinDir /usr/bin/X11
+ #endif
+@@ -1461,7 +1461,7 @@
+ #endif
+ #ifndef LibDir
+ # ifdef ProjectRoot
+-#  define LibDir Concat(ProjectRoot,/lib/X11)
++#  define LibDir Concat(ProjectRoot,/lib/nx/X11)
+ # else
+ #  define LibDir /usr/lib/X11
+ # endif
+--- a/nx-X11/config/cf/linux.cf
++++ b/nx-X11/config/cf/linux.cf
+@@ -1054,7 +1054,7 @@
+ 
+ #if HaveLib64
+ # ifndef LibDirName
+-#  define LibDirName		lib64
++#  define LibDirName		lib
+ # endif
+ # ifndef SystemUsrLibDir
+ #  define SystemUsrLibDir	/usr/lib64
+--- 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/lib/nx
++#define ProjectRoot /usr/local
+ #endif
+ 
+ /*
+@@ -87,7 +87,7 @@
+  * ProjectRoot rather than in /etc/X11.  See also HasVarDirectory,
+  * UseEtcX11 and UseSeparateConfDir.
+  *
+-#define EtcX11Directory ProjectRoot/etc
++#define EtcX11Directory /etc/nx
+  */
+ 
+ 
+--- a/nxproxy/Makefile.in
++++ b/nxproxy/Makefile.in
+@@ -33,7 +33,7 @@
+ 
+ srcdir      = @srcdir@
+ prefix      = @prefix@
+-exec_prefix = @exec_prefix@
++exec_prefix = @exec_prefix@/lib/nx
+ bindir      = @bindir@
+ man1dir     = @mandir@/man1
+ VPATH       = @srcdir@
diff --git a/debian/patches/020_add-nxagent-wrapper.full.patch b/debian/patches/020_add-nxagent-wrapper.full.patch
index 05d944b00..d44e760de 100644
--- a/debian/patches/020_add-nxagent-wrapper.full.patch
+++ b/debian/patches/020_add-nxagent-wrapper.full.patch
@@ -30,4 +30,4 @@
 +
 +export LD_LIBRARY_PATH
 +
-+exec $NX_LIBS/nxagent "$@"
++exec $NX_LIBS/bin/nxagent "$@"
diff --git a/debian/patches/021_add-nxauth-wrapper.full.patch b/debian/patches/021_add-nxauth-wrapper.full.patch
index 80bcde643..54df5d62a 100644
--- a/debian/patches/021_add-nxauth-wrapper.full.patch
+++ b/debian/patches/021_add-nxauth-wrapper.full.patch
@@ -29,4 +29,4 @@
 +test -d $NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
 +export LD_LIBRARY_PATH
 +
-+exec $NX_LIBS/nxauth "$@"
++exec $NX_LIBS/bin/nxauth "$@"
diff --git a/debian/patches/022_add-nxproxy-wrapper.full+lite.patch b/debian/patches/022_add-nxproxy-wrapper.full+lite.patch
index 6e4ee9f95..d8c49cff5 100644
--- a/debian/patches/022_add-nxproxy-wrapper.full+lite.patch
+++ b/debian/patches/022_add-nxproxy-wrapper.full+lite.patch
@@ -29,4 +29,4 @@
 +test -d $NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
 +export LD_LIBRARY_PATH
 +
-+exec $NX_LIBS/nxproxy "$@"
++exec $NX_LIBS/bin/nxproxy "$@"
diff --git a/debian/patches/023_add-x2goagent-wrapper.full.patch b/debian/patches/023_add-x2goagent-wrapper.full.patch
index ccc4aafdf..05b9134b7 100644
--- a/debian/patches/023_add-x2goagent-wrapper.full.patch
+++ b/debian/patches/023_add-x2goagent-wrapper.full.patch
@@ -30,4 +30,4 @@
 +
 +export LD_LIBRARY_PATH
 +
-+exec $NX_LIBS/../x2go/x2goagent "$@"
++exec $NX_LIBS/../x2go/bin/x2goagent "$@"
diff --git a/debian/patches/032_no-x11r6.debian.patch b/debian/patches/032_no-x11r6.debian.patch
deleted file mode 100644
index 09cbf4f37..000000000
--- a/debian/patches/032_no-x11r6.debian.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/lib/nx
-+#define ProjectRoot /usr/lib/nx
- #endif
- 
- /*
diff --git a/debian/patches/032_no-x11r6.full.patch b/debian/patches/032_no-x11r6.full.patch
deleted file mode 100644
index fff06e820..000000000
--- a/debian/patches/032_no-x11r6.full.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: No X11R6 Project Root
- We must not overlap with any existing files, therefore, both
- /usr/X11R6 and /usr are excluded possibilities for ProjectRoot.
- Use %_libexecdir/somename, since that is still allowed by FHS.
-Forward: pending
-Author: Jan Engelhardt <jengelh@medozas.de>
-Last-Update: 2012-01-27 01:35:49.164415307 +0100
----
- nx-X11/config/cf/site.def |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: nx-X11/config/cf/site.def
-===================================================================
---- a/nx-X11/config/cf/site.def
-+++ b/nx-X11/config/cf/site.def
-@@ -72,7 +72,7 @@ XCOMM site:  $XFree86: xc/config/cf/site
- #ifdef AfterVendorCF
- 
- #ifndef ProjectRoot
--#define ProjectRoot /usr/X11R6
-+#define ProjectRoot /usr/local/lib/nx
- #endif
- 
- /*
diff --git a/debian/patches/series b/debian/patches/series
index 3130888fb..2b961f29b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,7 +24,6 @@
 023_add-x2goagent-wrapper.full.patch
 030_nx-X11_configure-args.full.patch
 031_nx-X11_parallel-make.full.patch
-032_no-x11r6.full.patch
 051_nxcomp_macos105-fdisset.full+lite.patch
 052_nxcomp_macos10-nxauth-location.full+lite.patch
 101_nxagent_set-rgb-path.full.patch
@@ -48,4 +47,3 @@
 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch
 016_nx-X11_install-location.debian.patch
 102_xserver-xext_set-securitypolicy-path.debian.patch
-032_no-x11r6.debian.patch
diff --git a/debian/x2goagent.links b/debian/x2goagent.links
index 48b2ea57f..2aebb6cb7 100644
--- a/debian/x2goagent.links
+++ b/debian/x2goagent.links
@@ -1 +1 @@
-usr/lib/nx/nxagent usr/lib/x2go/x2goagent
+usr/lib/nx/bin/nxagent usr/lib/x2go/bin/x2goagent