The branch, master has been updated via 11980c79b29109d1cb6ae6d53cd4551e9fbea98b (commit) via fbb3ba912eac86753514da2175a14d8616ff91df (commit) via cd631e0bcdb50f95f7e7e42d3741f68579889140 (commit) from e3ba4bdc6ba2b3c0c287994636b651d37cedcfe1 (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 ----------------------------------------------------------------- commit 11980c79b29109d1cb6ae6d53cd4551e9fbea98b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Oct 19 09:56:26 2012 +0200 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. commit fbb3ba912eac86753514da2175a14d8616ff91df Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Oct 5 14:37:20 2012 +0200 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. commit cd631e0bcdb50f95f7e7e42d3741f68579889140 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Oct 5 14:26:48 2012 +0200 Fix patch file names concerning component nx-X11. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 + debian/nxagent.dirs | 2 +- debian/nxagent.install | 2 +- debian/nxauth.dirs | 2 +- debian/nxauth.install | 2 +- debian/nxproxy.dirs | 2 +- debian/nxproxy.install | 2 +- ... => 004_nx-X11_fix-nxcompshad-build.full.patch} | 0 .../patches/016_nx-X11_install-location.full.patch | 154 ++++++++++++++++++++ .../patches/016_nx-x11_install-location.full.patch | 32 ---- ...x-X11_update-autotools-helper-files.full.patch} | 0 ...nx-X11_update-libtool-ltmain-script.full.patch} | 0 ...xpat-build-against-system-libxmltok.full.patch} | 0 debian/patches/020_add-nxagent-wrapper.full.patch | 2 +- debian/patches/021_add-nxauth-wrapper.full.patch | 2 +- .../022_add-nxproxy-wrapper.full+lite.patch | 2 +- .../patches/023_add-x2goagent-wrapper.full.patch | 2 +- debian/patches/032_no-x11r6.full.patch | 24 --- ...patch => 202_nx-X11_enable-xinerama.full.patch} | 0 debian/patches/series | 13 +- debian/x2goagent.links | 2 +- nx-X11/config/cf/site.def | 2 +- 22 files changed, 177 insertions(+), 75 deletions(-) rename debian/patches/{004_nx-x11_fix-nxcompshad-build.full.patch => 004_nx-X11_fix-nxcompshad-build.full.patch} (100%) create mode 100644 debian/patches/016_nx-X11_install-location.full.patch delete mode 100644 debian/patches/016_nx-x11_install-location.full.patch rename debian/patches/{017_nx-x11_update-autotools-helper-files.full.patch => 017_nx-X11_update-autotools-helper-files.full.patch} (100%) rename debian/patches/{018_nx-x11_update-libtool-ltmain-script.full.patch => 018_nx-X11_update-libtool-ltmain-script.full.patch} (100%) rename debian/patches/{019_nx-x11_expat-build-against-system-libxmltok.full.patch => 019_nx-X11_expat-build-against-system-libxmltok.full.patch} (100%) delete mode 100644 debian/patches/032_no-x11r6.full.patch rename debian/patches/{202_nx-x11_enable-xinerama.full.patch => 202_nx-X11_enable-xinerama.full.patch} (100%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 010122a..5462b6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,11 @@ nx-libs (2:3.5.0.16-0) UNRELEASED; urgency=low * Fix installation of header files in Debian package. + * 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 25db3d7..544d2fa 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 76b62fc..6d1e230 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 4330bad..7c8e150 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 52d801c..94e4035 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 4330bad..7c8e150 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 42a49f2..7b2af0f 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/004_nx-x11_fix-nxcompshad-build.full.patch b/debian/patches/004_nx-X11_fix-nxcompshad-build.full.patch similarity index 100% rename from debian/patches/004_nx-x11_fix-nxcompshad-build.full.patch rename to debian/patches/004_nx-X11_fix-nxcompshad-build.full.patch diff --git a/debian/patches/016_nx-X11_install-location.full.patch b/debian/patches/016_nx-X11_install-location.full.patch new file mode 100644 index 0000000..6571aea --- /dev/null +++ b/debian/patches/016_nx-X11_install-location.full.patch @@ -0,0 +1,154 @@ +Description: FHS adaptation for Debian packaging + 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 +--- a/nx-X11/config/cf/Imake.tmpl ++++ b/nx-X11/config/cf/Imake.tmpl +@@ -820,12 +820,12 @@ + + #ifndef UsrLibDir + #ifdef ProjectRoot +-#define UsrLibDir Concat3(ProjectRoot,/,LibDirName) ++#define UsrLibDir Concat4(ProjectRoot,/,LibDirName,/nx) + #ifndef AlternateUsrLibDir + #define AlternateUsrLibDir YES + #endif + #else +-#define UsrLibDir Concat3(/usr,/,LibDirName) ++#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx) + #ifndef AlternateUsrLibDir + #define AlternateUsrLibDir NO + #endif +@@ -863,7 +863,7 @@ + #endif + #ifndef IncRoot + #ifdef ProjectRoot +-#define IncRoot Concat(ProjectRoot,/include) ++#define IncRoot Concat(ProjectRoot,/include/nx) + #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/016_nx-x11_install-location.full.patch b/debian/patches/016_nx-x11_install-location.full.patch deleted file mode 100644 index 0231bcb..0000000 --- a/debian/patches/016_nx-x11_install-location.full.patch +++ /dev/null @@ -1,32 +0,0 @@ -Description: FHS adaptation for Debian packaging - 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 ---- a/nx-X11/config/cf/Imake.tmpl -+++ b/nx-X11/config/cf/Imake.tmpl -@@ -820,12 +820,12 @@ - - #ifndef UsrLibDir - #ifdef ProjectRoot --#define UsrLibDir Concat3(ProjectRoot,/,LibDirName) -+#define UsrLibDir Concat4(ProjectRoot,/,LibDirName,/nx) - #ifndef AlternateUsrLibDir - #define AlternateUsrLibDir YES - #endif - #else --#define UsrLibDir Concat3(/usr,/,LibDirName) -+#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx) - #ifndef AlternateUsrLibDir - #define AlternateUsrLibDir NO - #endif -@@ -863,7 +863,7 @@ - #endif - #ifndef IncRoot - #ifdef ProjectRoot --#define IncRoot Concat(ProjectRoot,/include) -+#define IncRoot Concat(ProjectRoot,/include/nx) - #ifndef AlternateIncRoot - #define AlternateIncRoot YES - #endif diff --git a/debian/patches/017_nx-x11_update-autotools-helper-files.full.patch b/debian/patches/017_nx-X11_update-autotools-helper-files.full.patch similarity index 100% rename from debian/patches/017_nx-x11_update-autotools-helper-files.full.patch rename to debian/patches/017_nx-X11_update-autotools-helper-files.full.patch diff --git a/debian/patches/018_nx-x11_update-libtool-ltmain-script.full.patch b/debian/patches/018_nx-X11_update-libtool-ltmain-script.full.patch similarity index 100% rename from debian/patches/018_nx-x11_update-libtool-ltmain-script.full.patch rename to debian/patches/018_nx-X11_update-libtool-ltmain-script.full.patch diff --git a/debian/patches/019_nx-x11_expat-build-against-system-libxmltok.full.patch b/debian/patches/019_nx-X11_expat-build-against-system-libxmltok.full.patch similarity index 100% rename from debian/patches/019_nx-x11_expat-build-against-system-libxmltok.full.patch rename to debian/patches/019_nx-X11_expat-build-against-system-libxmltok.full.patch diff --git a/debian/patches/020_add-nxagent-wrapper.full.patch b/debian/patches/020_add-nxagent-wrapper.full.patch index 05d944b..d44e760 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 80bcde6..54df5d6 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 6e4ee9f..d8c49cf 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 ccc4aaf..05b9134 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.full.patch b/debian/patches/032_no-x11r6.full.patch deleted file mode 100644 index 97ce88c..0000000 --- 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/lib/NX3 - #endif - - /* diff --git a/debian/patches/202_nx-x11_enable-xinerama.full.patch b/debian/patches/202_nx-X11_enable-xinerama.full.patch similarity index 100% rename from debian/patches/202_nx-x11_enable-xinerama.full.patch rename to debian/patches/202_nx-X11_enable-xinerama.full.patch diff --git a/debian/patches/series b/debian/patches/series index 19525cc..2b961f2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,7 +2,7 @@ 001_add-main-makefile.full+lite.patch 002_nxcompshad_build-against-nx-x11-only.full.patch 003_nxcompshad_gcc43.full.patch -004_nx-x11_fix-nxcompshad-build.full.patch +004_nx-X11_fix-nxcompshad-build.full.patch 005_nxcomp_gcc43.full+lite.patch 006_nxcomp_libpng15.full+lite.patch 007_nxcompshad_clean-gch-files.full.patch @@ -14,17 +14,16 @@ 013_nxcompext_makefile-uninstall+autoconf.full.patch 014_nxcompshad_makefile-uninstall+autoconf.full.patch 015_nxproxy_makefile-uninstall.full+lite.patch -016_nx-x11_install-location.full.patch -017_nx-x11_update-autotools-helper-files.full.patch -018_nx-x11_update-libtool-ltmain-script.full.patch -019_nx-x11_expat-build-against-system-libxmltok.full.patch +016_nx-X11_install-location.full.patch +017_nx-X11_update-autotools-helper-files.full.patch +018_nx-X11_update-libtool-ltmain-script.full.patch +019_nx-X11_expat-build-against-system-libxmltok.full.patch 020_add-nxagent-wrapper.full.patch 021_add-nxauth-wrapper.full.patch 022_add-nxproxy-wrapper.full+lite.patch 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 @@ -37,7 +36,7 @@ 110_nxagent_createpixmap-bounds-check.full.patch 200_nxagent_check-binary-x2go-flavour.full.patch 201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch -202_nx-x11_enable-xinerama.full.patch +202_nx-X11_enable-xinerama.full.patch 203_nxagent_disable-rootless-exit.full.patch 204_nxagent_repaint-solidpict.full.patch 209_x2goagent-add-man-page.full.patch diff --git a/debian/x2goagent.links b/debian/x2goagent.links index 48b2ea5..2aebb6c 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 diff --git a/nx-X11/config/cf/site.def b/nx-X11/config/cf/site.def index 2d8c4ba..c242f0e 100644 --- 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.def,v 3.24 2000/06/25 20:17:29 dawes Ex #ifdef AfterVendorCF #ifndef ProjectRoot -#define ProjectRoot /usr/X11R6 +#define ProjectRoot /usr/local/lib/nx #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)).