[X2Go-Commits] [nx-libs] 01/02: debian/Makefile.nx-libs: make sure that 'make all' only calls 'make build' and _not_ the global '%:' ruleset afterwards.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit 1537eb05da13d34b5976f2190ce94ec0fdc2e657
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Apr 13 16:00:16 2017 +0200

    debian/Makefile.nx-libs: make sure that 'make all' only calls 'make build' and _not_ the global '%:' ruleset afterwards.
    
    Backported from Arctica GH 3.6.x branch.
    
    v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)
---
 debian/Makefile.nx-libs | 3 ++-
 debian/changelog        | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index 0760021..45ea8a9 100644
--- a/debian/Makefile.nx-libs
+++ b/debian/Makefile.nx-libs
@@ -30,7 +30,8 @@ SHELL:=/bin/bash
 	    if test -f nx-X11/Makefile; then ${MAKE} -C nx-X11 $@; fi; \
 	fi
 
-all: build
+all:
+	${MAKE} build
 
 test:
 	echo "No testing for NX (redistributed)"
diff --git a/debian/changelog b/debian/changelog
index eaaa292..d3e2375 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,11 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low
   * Xinerama symlinking: Attach Xinerama symlinking to nxagent bin:package (and
     not libnx-xinerama1).
     Backported from Arctica GH 3.6.x branch.
+  * debian/Makefile.nx-libs:
+    + Make sure that 'make all' only calls 'make build' and _not_ the global
+      '%:' ruleset afterwards.
+      Backported from Arctica GH 3.6.x branch.
+      v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)
 
   [ Ulrich Sibiller ]
   * nx-X11: Backport CVE-2017-2624 (timingsafe_memcmp)

--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git