From 1537eb05da13d34b5976f2190ce94ec0fdc2e657 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 13 Apr 2017 16:00:16 +0200 Subject: 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 0760021a1..45ea8a958 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 eaaa29294..d3e2375bf 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) -- cgit v1.2.3