The branch, master has been updated via 3132e1d023f23e175d0549d2af402b4843be46b2 (commit) from 4c66f3d5c1fcad75d13e2dbdd7b04a352e3029e9 (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 3132e1d023f23e175d0549d2af402b4843be46b2 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Dec 5 09:51:35 2011 +0100 Add patch 016_nx-x11-install.patch, to allow installation of nx-X11 from Makefile (via make install). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/patches/016_nx-x11-install.patch | 26 ++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 29 insertions(+), 0 deletions(-) create mode 100644 debian/patches/016_nx-x11-install.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 30224b2..98809c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,5 +29,7 @@ nx-libs (2:3.5.0-0~x2go1) UNRELEASED; urgency=low * Add patch: 015_nxproxy-makefile-uninstall.patch. * Add install/uninstall stanza to main Makefile (via patch 001_add-main-makefile.patch). + * Add patch 016_nx-x11-install.patch, to allow installation of nx-X11 from + Makefile (via make install). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 14 Oct 2011 03:01:39 +0200 diff --git a/debian/patches/016_nx-x11-install.patch b/debian/patches/016_nx-x11-install.patch new file mode 100644 index 0000000..7a643c1 --- /dev/null +++ b/debian/patches/016_nx-x11-install.patch @@ -0,0 +1,26 @@ +--- 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 Concat5(ProjectRoot,/,LibDirName,/,nx) + #ifndef AlternateUsrLibDir + #define AlternateUsrLibDir YES + #endif + #else +-#define UsrLibDir Concat3(/usr,/,LibDirName) ++#define UsrLibDir Concat5(/usr,/,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/series b/debian/patches/series index a6aa492..04a4fbc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,3 +13,4 @@ 013_nxcompext-makefile-uninstall.patch 014_nxcompshad-makefile-uninstall.patch 015_nxproxy-makefile-uninstall.patch +016_nx-x11-install.patch hooks/post-receive -- nx-libs.git (NX libraries) 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 libraries).