diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-13 16:00:16 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-04-18 17:37:40 +0200 |
| commit | 1537eb05da13d34b5976f2190ce94ec0fdc2e657 (patch) | |
| tree | e42e2bf2047c69c76ebb191222c66ef2d8aba58f | |
| parent | fb55fc3ef5a037ba881c5d18f782f9f988b48fe3 (diff) | |
| download | nx-libs-1537eb05da13d34b5976f2190ce94ec0fdc2e657.tar.gz nx-libs-1537eb05da13d34b5976f2190ce94ec0fdc2e657.tar.bz2 nx-libs-1537eb05da13d34b5976f2190ce94ec0fdc2e657.zip | |
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)
| -rw-r--r-- | debian/Makefile.nx-libs | 3 | ||||
| -rw-r--r-- | debian/changelog | 5 |
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) |