[X2go-Commits] nx-libs.git - master (branch) updated: redist-client/3.5.0.10-23-g9282c00

[X2go dev team]

The branch, master has been updated
       via  9282c00e2aaa02404809fe317308ccbb4da3b0e8 (commit)
      from  6a96ae450fb469bec1f23ebe727f6f318bfe80db (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 9282c00e2aaa02404809fe317308ccbb4da3b0e8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Feb 14 23:34:51 2012 +0100

    Update patch: 001_add-main-makefile.full+lite.patch, fix missing $(CONFIGURE) variable.

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

Summary of changes:
 debian/changelog                                   |    2 ++
 .../patches/001_add-main-makefile.full+lite.patch  |   10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 31384cf..0b45f2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
   * Rename patches 030_nx-X11_... and 031_nx-X11_..., the tarball roll script
     currently requires ,,full'' or ,,full+lite'' in the file name.
   * Make patch headers DEP5 compliant (030_nx-X11_... and 031_nx-X11_...).
+  * Update patch: 001_add-main-makefile.full+lite.patch, fix missing $(CONFIGURE)
+    variable.
 
   [ Jan Engelhardt ]
   * Update patch: 001_add-main-makefile.full+lite.patch, allow passing of
diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch
index 9f4351f..3c236b9 100644
--- a/debian/patches/001_add-main-makefile.full+lite.patch
+++ b/debian/patches/001_add-main-makefile.full+lite.patch
@@ -5,9 +5,11 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 Last-Update: 2011-12-31
 --- /dev/null
 +++ b/Makefile
-@@ -0,0 +1,34 @@
+@@ -0,0 +1,36 @@
 +#!/usr/bin/make -f
 +
++CONFIGURE=./configure
++
 +%:
 +	${MAKE} -C nxcomp $@
 +	${MAKE} -C nxproxy $@
@@ -23,12 +25,12 @@ Last-Update: 2011-12-31
 +	echo "No testing for NX (redistributed)"
 +
 +build-lite:
-+	cd nxcomp && autoconf && ./configure && ${MAKE}
-+	cd nxproxy && autoconf && ./configure && ${MAKE}
++	cd nxcomp && autoconf && (${CONFIGURE}) && ${MAKE}
++	cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE}
 +
 +build-full:
 +# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles...
-+	cd nxcomp && autoconf && ./configure
++	cd nxcomp && autoconf
 +	cd nxcompext && autoconf
 +	cd nxcompshad && autoconf
 +	cd nx-X11 && ${MAKE} World


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)).