[X2Go-Commits] nx-libs.git - master (branch) updated: redist-server/3.5.0.17-8-gf81df1a

X2Go dev team git-admin at x2go.org
Fri Mar 22 23:36:08 CET 2013


The branch, master has been updated
       via  f81df1a69982fb3c4cfe13248dec1b8bc3fb66af (commit)
      from  8f151d797b015b7d1070151e75d56587a7f3652f (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 f81df1a69982fb3c4cfe13248dec1b8bc3fb66af
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Mar 22 23:35:40 2013 +0100

    Main Makefile: Use absolute symlink when linking from $(X2GOLIBDIR) into $(NXLIBDIR) (i.e. linking x2goagent -> nxagent). (Fixes: #143).

-----------------------------------------------------------------------

Summary of changes:
 debian/Makefile.nx-libs |    2 +-
 debian/changelog        |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index beb522c..bb49073 100644
--- a/debian/Makefile.nx-libs
+++ b/debian/Makefile.nx-libs
@@ -66,7 +66,7 @@ install-full:
 	   $(MAKE) -C $$d install; done
 
 	$(INSTALL_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/
-	cd $(DESTDIR)$(X2GOLIBDIR)/bin/ && ln -sf ../../nx/bin/nxagent x2goagent
+	cd $(DESTDIR)$(X2GOLIBDIR)/bin/ && ln -sf $(DESTDIR)$(NXLIBDIR)/bin/nxagent x2goagent
 
 	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/pixmaps
 	$(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/x2go.xpm $(DESTDIR)$(PREFIX)/share/pixmaps
diff --git a/debian/changelog b/debian/changelog
index 824d746..bd680a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ nx-libs (2:3.5.0.18-0) UNRELEASED; urgency=low
   * Work-in patch from Jan Engehardt for working around different
     improper bash implementations of string-in-string replacing. (Fixes:
     #145).
+  * Main Makefile: Use absolute symlink when linking from $(X2GOLIBDIR)
+    into $(NXLIBDIR) (i.e. linking x2goagent -> nxagent). (Fixes: #143).
 
   [ Orion Poplawski ]
   * Fix wrong symlink direction of libNX_* files. (Fixes: #107).


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