This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch 3.6.x in repository nx-libs. from 1dad092 Merge branch '3.6.x' adds dfa24dd nx-X11/config/cf/linux.cf: don't override default CC options for {ARM,PPC}{32,64}. adds a22213e nx-libs.spec: only remove files in the BuildRoot. adds 3d59e2c nxcomp/Makefile.am: call aclocal with the correct include dir argument. adds a10b9c6 nx-X11/config/cf/linux.cf: recursive macros aren't a thing. adds df6afb6 nxcomp/test/logging_test.cpp: return a value in non-void function. adds 0e0eb5a {nx-X11/lib,nxproxy}/Makefile.am: also use correct aclocal flags in the other locations. adds 1d431b5 nxcompshad/Makefile.am: also correctly call aclocal here. adds 0bbef4f nx-libs.spec: also own %{_datadir}/nx/X11, since %dir explicitly does not recurse down. adds baf61fb debian/: add compat.sh file containing compatibility logic for older Debian and Ubuntu versions. adds fb2e9a8 debian/rules: execute new debian/compat.sh file before the actual build. adds fe011b5 Support building with legacy (pre-1.4.2) libXfont(1) versions. adds c7c4987 nx-libs.spec: older *SUSE versions do not split up (all) libraries in a useful manner. adds 3411a8b nx-libs.spec: imake is part of xorg-x11-util-devel on older *SUSE versions and the splitted imake package on later versions. adds 3206eac nx-libs.spec: pixman is called libpixman-1-0 on older *SUSE versions. adds c173e6b Makefile: correctly quote variables when passing them down to other programs. adds 4c4f2b1 debian/control: add dependencies needed for debian/compat.sh. adds ddd6f72 nx{comp{,shad},proxy}: use dist-bzip2 instead of dist-xz. adds cc47066 nx-libs.spec: add xorg-x11-libXext-devel build dependency for older *SUSE versions. adds 0d6207b Revert "nx-libs.spec: add xorg-x11-libXext-devel build dependency for older *SUSE versions." adds e92c2a8 Support building with legacy (pre-7.1.0) Xext proto versions. adds 779a116 Support building with legacy zlib versions that do not ship a pkg-config file. adds e37532c nx-X11/programs/Xserver/include/misc.h: add compat define for SHMNAME. adds 404e663 zlib compatibility: whenever we want -I flags only, assume that the headers are directly available. adds caa048a Handle SHAPE proto splitup gracefully for legacy Xext proto versions. adds 3abdb99 nx-X11/programs/Xserver/Xext/shape.c: pull in shapestr.h for legacy Xext proto versions, since shape.h would pull in Xlib. adds 1e2fc15 nx-X11/programs/Xserver/Xext/shape.c: avoid pulling in Xlib in legacy mode via the _SHAPE_SERVER_ macro. adds e7b7445 Drop SHMNAME workaround again, it *is* defined in shmstr.h, which is actually header I was searching for. No new revisions were added by this update. Summary of changes: Makefile | 15 ++++--- debian/compat.sh | 46 ++++++++++++++++++++++ debian/control | 5 ++- debian/rules | 2 +- m4/nx-macros.m4 | 18 +++++++++ nx-X11/config/cf/Imake.tmpl | 18 ++++++++- nx-X11/config/cf/host.def | 14 +++++++ nx-X11/config/cf/linux.cf | 5 +-- nx-X11/config/cf/xorg.cf | 8 ++++ nx-X11/lib/Makefile.am | 2 + nx-X11/programs/Xserver/Imakefile | 2 +- nx-X11/programs/Xserver/Xext/shape.c | 11 ++++++ nx-X11/programs/Xserver/Xext/xvdisp.c | 4 ++ nx-X11/programs/Xserver/dix/dixfonts.c | 6 +++ nx-X11/programs/Xserver/hw/nxagent/Imakefile | 4 +- .../programs/Xserver/hw/nxagent/compext/Imakefile | 2 +- nx-X11/programs/Xserver/include/dixfont.h | 4 ++ nx-X11/programs/Xserver/mi/miinitext.c | 4 ++ nx-libs.spec | 18 ++++----- nxcomp/Makefile.am | 2 + nxcomp/configure.ac | 4 +- nxcomp/test/logging_test.cpp | 2 + nxcompshad/Makefile.am | 2 + nxcompshad/configure.ac | 2 +- nxproxy/Makefile.am | 4 +- nxproxy/configure.ac | 2 +- 26 files changed, 175 insertions(+), 31 deletions(-) create mode 100755 debian/compat.sh -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git