[X2go-Commits] nx-libs.git - master (branch) updated: redist-client/3.5.0.15-9-gd397710

X2Go dev team git-admin at x2go.org
Sat Oct 20 17:58:07 CEST 2012


The branch, master has been updated
       via  d39771037bea6109cc7ce2e41c9f0d3271f536a3 (commit)
      from  30d311a6874f3d23e0ee9334d2160e8af724108c (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 d39771037bea6109cc7ce2e41c9f0d3271f536a3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Oct 20 17:58:04 2012 +0200

    Modify patch: 001_add-main-makefile.full+lite.patch. Install nx* and x2goagent wrapper scripts during make install.

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

Summary of changes:
 debian/changelog                                   |    2 ++
 .../patches/001_add-main-makefile.full+lite.patch  |   21 +++++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 06b5efa..9666d6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ nx-libs (2:3.5.0.16-0) UNRELEASED; urgency=low
     make build has run.
   * Add patch: 025_nxproxy_no-configure-file.full+lite.patch. Remove
     unneeded build file from NoMachine's nxproxy sources.
+  * Modify patch: 001_add-main-makefile.full+lite.patch. Install nx* and
+    x2goagent wrapper scripts during make install.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 21 Sep 2012 10:06:54 +0200
 
diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch
index fffa4dc..5c13e63 100644
--- a/debian/patches/001_add-main-makefile.full+lite.patch
+++ b/debian/patches/001_add-main-makefile.full+lite.patch
@@ -5,12 +5,13 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 Last-Update: 2011-12-31
 --- /dev/null
 +++ b/Makefile
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,37 @@
 +#!/usr/bin/make -f
 +
 +CONFIGURE=./configure
 +
 +%:
++	if test -f bin/Makefile; then ${MAKE} -C bin $@; fi
 +	if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi
 +	if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi
 +	if test -d nx-X11; then \
@@ -42,3 +43,21 @@ Last-Update: 2011-12-31
 +	else \
 +	    ${MAKE} build-full; \
 +	fi
+--- /dev/null
++++ b/bin/Makefile
+@@ -0,0 +1,15 @@
++#!/usr/bin/make -f
++
++INSTALL_DIR=install -d -o root -g root -m 755
++INSTALL_FILE=install -o root -g root -m 644
++INSTALL_PROGRAM=install -o root -g root -m 755
++
++DESTDIR=
++PREFIX ?= /usr/local
++BINDIR=$(PREFIX)/bin
++
++%:
++
++install:
++	find nx* | while read file; do $(INSTALL_PROGRAM) $$file $(BINDIR)/; done
++	find x2go* | while read file; do $(INSTALL_PROGRAM) $$file $(BINDIR)/; done


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