[X2Go-Commits] x2goclient.git - build-main (branch) updated: 4.0.1.1-49-g4bf8e6e

X2Go dev team git-admin at x2go.org
Tue Dec 17 15:43:33 CET 2013


The branch, build-main has been updated
       via  4bf8e6eb54fae222d753c74dea5f8e928d5e8fed (commit)
      from  ef0c348d73b8870ece8642362986efb33d6e12d0 (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:
 Makefile         |    4 +++-
 debian/changelog |    2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/Makefile b/Makefile
index 6b667e1..5318f71 100755
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,9 @@ LRELEASE_BINARY=/usr/bin/lrelease
 
 all: build
 
-build: build_client build_plugin build_man
+build: build_man
+	$(MAKE) build_client
+	$(MAKE) build_plugin
 
 build_client:
 	$(LRELEASE_BINARY) x2goclient.pro
diff --git a/debian/changelog b/debian/changelog
index 37f1345..df069a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ x2goclient (4.0.1.2-0x2go2) UNRELEASED; urgency=low
     - Allow patching of qmake-qt4 executable path in Makefile.
     - Make qmake-qt4 and lrelease path in Makefile easily replacable (as
       RHEL-5 does not have those tools in $PATH).
+    - Make sure that build_client and build_plugin are not build with parallel
+      make.
   * Pull-in packaging changes from Debian.
   * debian/source/format:
     + Switch to format 1.0.


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

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 "x2goclient.git" (X2Go Client).




More information about the x2go-commits mailing list