[X2Go-Commits] nx-libs.git - build-main (branch) updated: redist-server/3.5.0.7-2-g8b013ce

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


The branch, build-main has been updated
       via  8b013ce809a9a01fde6444fb631864eca4ad244f (commit)
      from  e9241fe8c730aa7f0b95b15b34ed5c2bda18b5ad (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                                   |    2 +
 .../patches/001_add-main-makefile.full+lite.patch  |   50 ++++++++++----------
 2 files changed, 27 insertions(+), 25 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f1e90e2..72fb0f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ nx-libs (2:3.5.0.8-0) UNRELEASED; urgency=low
 
   * Reorganize patch names, to reflect patch inclusion into lite+full or
     full-only ,,NX (redistributed)'' tarball.
+  * Update patch: 001_add-main-makefile.full+lite.patch, only build, install,
+    clean etc. NX subprojects if the folder exists.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 16 Jan 2012 22:28:13 +0100
 
diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch
index df3f4e7..533ce7e 100644
--- a/debian/patches/001_add-main-makefile.full+lite.patch
+++ b/debian/patches/001_add-main-makefile.full+lite.patch
@@ -13,39 +13,39 @@ Last-Update: 2011-12-31
 +build: build-arch build-indep
 +
 +clean:
-+	cd nx-X11 && test -f Makefile && make $@ || true
-+	cd nxcomp && test -f Makefile && make $@ || true
-+	cd nxcompext && test -f Makefile && make $@ || true
-+	cd nxcompshad && test -f Makefile && make $@ || true
-+	cd nxproxy && test -f Makefile && make $@ || true
++	test -d nx-X11 && cd nx-X11 && test -f Makefile && make $@ || true
++	test -d nxcomp && cd nxcomp && test -f Makefile && make $@ || true
++	test -d nxcompext && cd nxcompext && test -f Makefile && make $@ || true
++	test -d nxcompshad && cd nxcompshad && test -f Makefile && make $@ || true
++	test -d nxproxy && cd nxproxy && test -f Makefile && make $@ || true
 +
 +
 +distclean:
-+	cd nx-X11 && test -f Makefile && make $@ || true
-+	cd nxcomp && test -f Makefile && make $@ || true
-+	cd nxcompext && test -f Makefile && make $@ || true
-+	cd nxcompshad && test -f Makefile && make $@ || true
-+	cd nxproxy && test -f Makefile && make $@ || true
++	test -d nx-X11 && cd nx-X11 && test -f Makefile && make $@ || true
++	test -d nxcomp && cd nxcomp && test -f Makefile && make $@ || true
++	test -d nxcompext && cd nxcompext && test -f Makefile && make $@ || true
++	test -d nxcompshad && cd nxcompshad && test -f Makefile && make $@ || true
++	test -d nxproxy && cd nxproxy && test -f Makefile && make $@ || true
 +
 +build-arch:
-+	cd nxcomp && autoconf
-+	cd nxcompext && autoconf
-+	cd nxcompshad && autoconf
-+	cd nx-X11 && make World
-+	cd nxproxy && autoconf && ./configure && make
++	test -d nxcomp && cd nxcomp && autoconf
++	test -d nxcompext && cd nxcompext && autoconf
++	test -d nxcompshad && cd nxcompshad && autoconf
++	test -d nx-X11 && cd nx-X11 && make World
++	test -d nxproxy && cd nxproxy && autoconf && ./configure && make
 +
 +build-indep:
 +
 +install:
-+	cd nxcomp && make install
-+	cd nxcompext && make install
-+	cd nxcompshad && make install
-+	cd nx-X11 && make install
-+	cd nxproxy && make install
++	test -d nxcomp && cd nxcomp && make install
++	test -d nxcompext && cd nxcompext && make install
++	test -d nxcompshad && cd nxcompshad && make install
++	test -d nx-X11 && cd nx-X11 && make install
++	test -d nxproxy && cd nxproxy && make install
 +
 +uninstall:
-+	cd nxcomp && make uninstall
-+	cd nxcompext && make uninstall
-+	cd nxcompshad && make uninstall
-+	cd nx-X11 && make uninstall
-+	cd nxproxy && make uninstall
++	test -d nxcomp && cd nxcomp && make uninstall
++	test -d nxcompext && cd nxcompext && make uninstall
++	test -d nxcompshad && cd nxcompshad && make uninstall
++	test -d nx-X11 && cd nx-X11 && make uninstall
++	test -d nxproxy && cd nxproxy && make uninstall


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