[debian-edu-commits] debian-edu/ 04/22: Merge tag 'upstream/0.9.0_20161027+gitc524b06'

[Dominik George]

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch fix-repo
in repository xrdp.

commit a4e47576b410e474cb2af2711f010023459aa99a
Merge: 60a379f 6906e43
Author: Dominik George <nik at naturalnet.de>
Date:   Thu Oct 27 20:45:44 2016 +0200

    Merge tag 'upstream/0.9.0_20161027+gitc524b06'
    
    Upstream version 0.9.0~20161027+gitc524b06

 Makefile.am                       |   2 +-
 coding_style.md                   |  17 +-
 common/list.c                     |   2 +-
 common/list.h                     |   2 +-
 common/log.c                      |   2 +-
 common/log.h                      |  12 +-
 common/os_calls.c                 |  12 +-
 common/os_calls.h                 |   4 +-
 file-loc.txt                      |  37 ++-
 instfiles/Makefile.am             |   1 +
 instfiles/keymap-names.txt        | 124 +++++++
 instfiles/km-040a.ini             | 659 ++++++++++++++++++++++++++++++++++++++
 libxrdp/Makefile.am               |  47 ++-
 libxrdp/xrdp_rdp.c                |  13 +-
 neutrinordp/Makefile.am           |  15 +-
 prog_std.txt                      |  41 ---
 rdp/Makefile.am                   |  15 +-
 readme.txt                        |   2 +-
 sesman/access.c                   |   4 +-
 sesman/access.h                   |   4 +-
 sesman/auth.h                     |   8 +-
 sesman/chansrv/Makefile.am        |  38 +--
 sesman/chansrv/clipboard_file.c   |   2 +-
 sesman/chansrv/fifo.c             |   8 +-
 sesman/config.c                   |  24 +-
 sesman/config.h                   |   3 +
 sesman/env.c                      |   6 +-
 sesman/env.h                      |   6 +-
 sesman/libscp/libscp_connection.c |   2 +-
 sesman/libscp/libscp_session.c    |   2 +-
 sesman/libscp/libscp_v1s.c        |   2 -
 sesman/scp.c                      |  13 +-
 sesman/scp_v0.c                   |   6 +-
 sesman/scp_v1.c                   |   4 -
 sesman/scp_v1_mng.c               |   3 -
 sesman/session.c                  |  14 +-
 sesman/session.h                  |   5 +-
 sesman/sig.c                      |   3 +
 sesman/tools/sesadmin.c           |   8 +-
 sesman/verify_user.c              |   6 +-
 sesman/verify_user_bsd.c          |   6 +-
 sesman/verify_user_kerberos.c     |   2 +-
 sesman/verify_user_pam.c          |   2 +-
 sesman/verify_user_pam_userpass.c |   2 +-
 xorg/X11R7.6/.gitignore           |   3 +
 xorg/X11R7.6/buildx.sh            |  92 +++---
 xorg/X11R7.6/x11_file_list.txt    |  16 +-
 xrdp/Makefile.am                  |  47 ++-
 xrdp/xrdp.ini                     |   5 +-
 xrdp/xrdp_bitmap.c                |   8 +-
 xrdpapi/Makefile.am               |  15 -
 xrdpvr/Makefile.am                |  15 -
 52 files changed, 1050 insertions(+), 341 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/xrdp.git