aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/Makefile.nx-libs3
-rw-r--r--debian/changelog5
2 files changed, 7 insertions, 1 deletions
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)