This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit b496db86e1fae8a8eb7aae3d5b80d5b4f6f24dfb Merge: b4fb15d 711fd24 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 26 06:45:42 2018 +0100 Merge branch '3.6.x' into 3.6.x-rpm-debug debian/control | 4 +- debian/copyright | 53 +- debian/nx-x11proto-xext-dev.install | 1 + debian/watch | 3 - m4/nx-macros.m4 | 17 + nx-X11/include/extensions/Imakefile | 1 + nx-X11/include/extensions/shapeconst.h | 55 + nx-X11/include/extensions/xfixesproto.h | 79 +- nx-X11/include/extensions/xfixeswire.h | 43 +- nx-X11/programs/Xserver/Xi/allowev.c | 85 +- nx-X11/programs/Xserver/Xi/allowev.h | 14 +- nx-X11/programs/Xserver/Xi/chgdctl.c | 161 ++- nx-X11/programs/Xserver/Xi/chgdctl.h | 26 +- nx-X11/programs/Xserver/Xi/chgfctl.c | 582 +++++------ nx-X11/programs/Xserver/Xi/chgfctl.h | 110 +- nx-X11/programs/Xserver/Xi/chgkbd.c | 124 ++- nx-X11/programs/Xserver/Xi/chgkbd.h | 25 +- nx-X11/programs/Xserver/Xi/chgkmap.c | 48 +- nx-X11/programs/Xserver/Xi/chgkmap.h | 14 +- nx-X11/programs/Xserver/Xi/chgprop.c | 83 +- nx-X11/programs/Xserver/Xi/chgprop.h | 14 +- nx-X11/programs/Xserver/Xi/chgptr.c | 143 ++- nx-X11/programs/Xserver/Xi/chgptr.h | 65 +- nx-X11/programs/Xserver/Xi/closedev.c | 101 +- nx-X11/programs/Xserver/Xi/closedev.h | 38 +- nx-X11/programs/Xserver/Xi/devbell.c | 69 +- nx-X11/programs/Xserver/Xi/devbell.h | 14 +- nx-X11/programs/Xserver/Xi/exevents.c | 1102 +++++++++----------- nx-X11/programs/Xserver/Xi/exglobals.h | 66 +- nx-X11/programs/Xserver/Xi/extinit.c | 746 +++++++------ nx-X11/programs/Xserver/Xi/getbmap.c | 67 +- nx-X11/programs/Xserver/Xi/getbmap.h | 26 +- nx-X11/programs/Xserver/Xi/getdctl.c | 150 ++- nx-X11/programs/Xserver/Xi/getdctl.h | 40 +- nx-X11/programs/Xserver/Xi/getfctl.c | 281 +++-- nx-X11/programs/Xserver/Xi/getfctl.h | 98 +- nx-X11/programs/Xserver/Xi/getfocus.c | 50 +- nx-X11/programs/Xserver/Xi/getfocus.h | 26 +- nx-X11/programs/Xserver/Xi/getkmap.c | 87 +- nx-X11/programs/Xserver/Xi/getkmap.h | 26 +- nx-X11/programs/Xserver/Xi/getmmap.c | 72 +- nx-X11/programs/Xserver/Xi/getmmap.h | 26 +- nx-X11/programs/Xserver/Xi/getprop.c | 139 ++- nx-X11/programs/Xserver/Xi/getprop.h | 42 +- nx-X11/programs/Xserver/Xi/getselev.c | 124 ++- nx-X11/programs/Xserver/Xi/getselev.h | 26 +- nx-X11/programs/Xserver/Xi/getvers.c | 62 +- nx-X11/programs/Xserver/Xi/getvers.h | 26 +- nx-X11/programs/Xserver/Xi/grabdev.c | 132 +-- nx-X11/programs/Xserver/Xi/grabdev.h | 44 +- nx-X11/programs/Xserver/Xi/grabdevb.c | 95 +- nx-X11/programs/Xserver/Xi/grabdevb.h | 14 +- nx-X11/programs/Xserver/Xi/grabdevk.c | 96 +- nx-X11/programs/Xserver/Xi/grabdevk.h | 14 +- nx-X11/programs/Xserver/Xi/gtmotion.c | 106 +- nx-X11/programs/Xserver/Xi/gtmotion.h | 26 +- nx-X11/programs/Xserver/Xi/listdev.c | 268 +++-- nx-X11/programs/Xserver/Xi/listdev.h | 116 +-- nx-X11/programs/Xserver/Xi/opendev.c | 105 +- nx-X11/programs/Xserver/Xi/opendev.h | 26 +- nx-X11/programs/Xserver/Xi/queryst.c | 150 ++- nx-X11/programs/Xserver/Xi/queryst.h | 26 +- nx-X11/programs/Xserver/Xi/selectev.c | 82 +- nx-X11/programs/Xserver/Xi/selectev.h | 14 +- nx-X11/programs/Xserver/Xi/sendexev.c | 91 +- nx-X11/programs/Xserver/Xi/sendexev.h | 14 +- nx-X11/programs/Xserver/Xi/setbmap.c | 76 +- nx-X11/programs/Xserver/Xi/setbmap.h | 26 +- nx-X11/programs/Xserver/Xi/setdval.c | 83 +- nx-X11/programs/Xserver/Xi/setdval.h | 26 +- nx-X11/programs/Xserver/Xi/setfocus.c | 41 +- nx-X11/programs/Xserver/Xi/setfocus.h | 14 +- nx-X11/programs/Xserver/Xi/setmmap.c | 82 +- nx-X11/programs/Xserver/Xi/setmmap.h | 26 +- nx-X11/programs/Xserver/Xi/setmode.c | 64 +- nx-X11/programs/Xserver/Xi/setmode.h | 26 +- nx-X11/programs/Xserver/Xi/stubs.c | 85 +- nx-X11/programs/Xserver/Xi/ungrdev.c | 43 +- nx-X11/programs/Xserver/Xi/ungrdev.h | 14 +- nx-X11/programs/Xserver/Xi/ungrdevb.c | 92 +- nx-X11/programs/Xserver/Xi/ungrdevb.h | 14 +- nx-X11/programs/Xserver/Xi/ungrdevk.c | 98 +- nx-X11/programs/Xserver/Xi/ungrdevk.h | 14 +- nx-X11/programs/Xserver/dbe/Imakefile | 8 + nx-X11/programs/Xserver/dbe/dbe.c | 144 +-- nx-X11/programs/Xserver/dbe/dbestruct.h | 6 - nx-X11/programs/Xserver/dbe/midbe.c | 54 +- nx-X11/programs/Xserver/dbe/midbe.h | 1 - nx-X11/programs/Xserver/dix/atom.c | 2 + nx-X11/programs/Xserver/dix/colormap.c | 10 + nx-X11/programs/Xserver/dix/devices.c | 41 +- nx-X11/programs/Xserver/dix/dispatch.c | 21 +- nx-X11/programs/Xserver/dix/events.c | 27 +- nx-X11/programs/Xserver/dix/extension.c | 51 +- nx-X11/programs/Xserver/dix/ffs.c | 2 + nx-X11/programs/Xserver/dix/globals.c | 13 +- nx-X11/programs/Xserver/dix/main.c | 3 +- nx-X11/programs/Xserver/dix/pixmap.c | 9 + nx-X11/programs/Xserver/dix/privates.c | 58 ++ nx-X11/programs/Xserver/dix/swaprep.c | 6 +- nx-X11/programs/Xserver/dix/swapreq.c | 2 - nx-X11/programs/Xserver/dix/window.c | 80 +- nx-X11/programs/Xserver/dix/xpstubs.c | 2 + nx-X11/programs/Xserver/hw/nxagent/Args.c | 18 + nx-X11/programs/Xserver/hw/nxagent/Events.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXevents.c | 5 +- nx-X11/programs/Xserver/hw/nxagent/NXproperty.c | 8 +- nx-X11/programs/Xserver/hw/nxagent/NXwindow.c | 56 +- nx-X11/programs/Xserver/hw/nxagent/Options.c | 2 + nx-X11/programs/Xserver/hw/nxagent/Options.h | 6 + nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 12 +- nx-X11/programs/Xserver/include/colormapst.h | 19 +- nx-X11/programs/Xserver/include/extension.h | 12 + nx-X11/programs/Xserver/include/extnsionst.h | 3 + nx-X11/programs/Xserver/include/opaque.h | 2 +- nx-X11/programs/Xserver/include/pixmapstr.h | 13 +- .../programs/Xserver/include/protocol-versions.h | 2 +- nx-X11/programs/Xserver/include/window.h | 7 + nx-X11/programs/Xserver/os/utils.c | 2 - nx-X11/programs/Xserver/xfixes/cursor.c | 304 +++++- nx-X11/programs/Xserver/xfixes/region.c | 21 +- nx-X11/programs/Xserver/xfixes/saveset.c | 8 +- nx-X11/programs/Xserver/xfixes/select.c | 13 +- nx-X11/programs/Xserver/xfixes/xfixes.c | 33 +- nx-X11/programs/Xserver/xfixes/xfixes.h | 2 - nx-X11/programs/Xserver/xfixes/xfixesint.h | 43 +- nxcomp/configure.ac | 2 +- nxcomp/src/Loop.cpp | 3 +- nxcomp/src/Misc.cpp | 1 + nxcompshad/configure.ac | 4 +- nxcompshad/src/Makefile.am | 7 +- nxproxy/configure.ac | 2 + nxproxy/man/nxproxy.1 | 1 + nxproxy/src/Makefile.am | 5 + 134 files changed, 4242 insertions(+), 4413 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git