[X2Go-Commits] nx-libs.git - build-main (branch) updated: redist-client/3.5.0.11-2-g0586f0d

X2Go dev team git-admin at x2go.org
Fri Aug 30 16:23:28 CEST 2013


The branch, build-main has been updated
       via  0586f0d6e83cfa9ea12a3bf6a0015a4e84d09ae2 (commit)
      from  a8bf2dd819ac55535b11e38848ffc9b076a5d307 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 295c82e..f1697bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 nx-libs (2:3.5.0.12-0) UNRELEASED; urgency=low
 
-  * Continue development...
+  * Update patch: 001_add-main-makefile.full+lite.patch, adapt patch from
+    packaging. Test for Makefiles in subfolders before calling them.
+    Fixes build failure during ,,make distclean'' calls.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 22 Feb 2012 15:05:38 +0100
 
diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch
index 3c236b9..fffa4dc 100644
--- a/debian/patches/001_add-main-makefile.full+lite.patch
+++ b/debian/patches/001_add-main-makefile.full+lite.patch
@@ -11,12 +11,12 @@ Last-Update: 2011-12-31
 +CONFIGURE=./configure
 +
 +%:
-+	${MAKE} -C nxcomp $@
-+	${MAKE} -C nxproxy $@
++	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 \
-+	    ${MAKE} -C nxcompext $@; \
-+	    ${MAKE} -C nxcompshad; \
-+	    ${MAKE} -C nx-X11 $@; \
++	    if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \
++	    if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \
++	    if test -f nx-X11/Makefile; then ${MAKE} -C nx-X11 $@; fi; \
 +	fi
 +
 +all: build


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