This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository nx-libs. from fb55fc3 nx-X11: use the "old", non-NX header location. new 1537eb0 debian/Makefile.nx-libs: make sure that 'make all' only calls 'make build' and _not_ the global '%:' ruleset afterwards. new 0c9852a {debian/control,nx-libs.spec}: add proper dependencies upon xkbcomp for RPM and DEB packages. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/Makefile.nx-libs | 3 ++- debian/changelog | 9 +++++++++ debian/control | 2 ++ nx-libs.spec | 14 ++++++++++++++ 4 files changed, 27 insertions(+), 1 deletion(-) -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
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@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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 0c9852a76ef405bc28b7e33d8cf14d0e5f49d352 Author: Mihai Moldovan <ïonic@ionic.de> Date: Tue Apr 18 17:21:53 2017 +0000 {debian/control,nx-libs.spec}: add proper dependencies upon xkbcomp for RPM and DEB packages. Backported from Arctica GH 3.6.x branch. v2: backport to nx-libs 3.5.0.x (Mihai Moldovan) --- debian/changelog | 4 ++++ debian/control | 2 ++ nx-libs.spec | 14 ++++++++++++++ 3 files changed, 20 insertions(+) diff --git a/debian/changelog b/debian/changelog index d3e2375..f99ac2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,10 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low * nx-X11: use the "old", non-NX header location. Affects: - 1270_nx-X11_CVE-2017-2624-Use-timingsafe_memcmp-to-c.full.patch + * {debian/control,nx-libs.spec}: + - Add proper dependencies upon xkbcomp for RPM and DEB packages. + Backported from Arctica GH 3.6.x branch. + v2: backport to nx-libs 3.5.0.x (Mihai Moldovan) [ Mike Gabriel ] * debian/libxinerama1.postinst.in: diff --git a/debian/control b/debian/control index aa444fe..5dcab77 100644 --- a/debian/control +++ b/debian/control @@ -1007,6 +1007,8 @@ Depends: # </Workaround> ${shlibs:Depends}, ${misc:Depends}, +# For /usr/bin/xkbcomp + x11-xkb-utils, Recommends: xfonts-base, xkb-data, diff --git a/nx-libs.spec b/nx-libs.spec index e0d5d8b..cc21a84 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -599,6 +599,20 @@ Requires: xorg-x11-fonts-core # works without the dependency. Requires: xkeyboard-config +# For /usr/bin/xkbcomp +%if 0%{?fedora} || 0%{?rhel} +Requires: xorg-x11-xkb-utils +%else +%if 0%{?suse_version} +%if 0%{?suse_version} >= 1310 +Requires: xkbcomp +%else +# Older *SUSE versions bundle xkbcomp in xorg-x11. Ugly, but nothing we could change. +Requires: xorg-x11 +%endif +%endif +%endif + %description -n nxagent NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
-
git-admin＠x2go.org