[X2go-Commits] nx-libs.git - master (branch) updated: redist-server/3.5.0.17-2-gb121300

X2Go dev team git-admin at x2go.org
Mon Jan 7 10:46:19 CET 2013


The branch, master has been updated
       via  b121300fde0496d06ce6bb9c58ae85a8e84cd09b (commit)
      from  39e84229d6b5c744513fff3f37cd4685ecb4f74b (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 b121300fde0496d06ce6bb9c58ae85a8e84cd09b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jan 7 10:45:58 2013 +0100

    Remove duplicate install of nxproxy from main Makefile. Spotted by Jan Engelhard.

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

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

The diff of changes is:
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index 5cfc96e..93c7627 100644
--- a/debian/Makefile.nx-libs
+++ b/debian/Makefile.nx-libs
@@ -58,8 +58,6 @@ install-lite:
 	   $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done
 	for d in nxcomp nxproxy; do \
 	   $(MAKE) -C $$d install; done
-	$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin
-	$(INSTALL_PROGRAM) nxproxy/nxproxy $(DESTDIR)$(NXLIBDIR)/bin
 
 install-full:
 	for f in nxagent nxauth x2goagent; do \
diff --git a/debian/changelog b/debian/changelog
index 5fe3a88..13b08e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 nx-libs (2:3.5.0.18-0) UNRELEASED; urgency=low
 
-  * Continue development...
+  * Remove duplicate install of nxproxy from main Makefile. Spotted by Jan
+    Engelhard.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 04 Jan 2013 13:27:05 +0100
 


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