[debian-edu-commits] debian-edu/ 19/22: Merge branch 'master' into fix-repo

Dominik George natureshadow-guest at moszumanska.debian.org
Thu Oct 27 21:15:44 UTC 2016


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 58d9a616a9914c179fee2b262e2fe0e7baa05701
Merge: 18d230f f64dd29
Author: Dominik George <nik at naturalnet.de>
Date:   Thu Oct 27 23:09:18 2016 +0200

    Merge branch 'master' into fix-repo

 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 +-
 debian/changelog                                 |  10 +
 debian/control                                   |   4 +-
 debian/copyright                                 |   5 +-
 debian/patches/fix-build-with-openssl-1.1.0.diff | 162 ++++++
 debian/patches/make-fixes.diff                   |  34 +-
 debian/patches/series                            |   1 +
 debian/rules                                     |   2 +-
 file-loc.txt                                     |  37 +-
 instfiles/Makefile.am                            |   1 +
 instfiles/keymap-names.txt                       | 124 +++++
 instfiles/km-040a.ini                            | 659 +++++++++++++++++++++++
 librfxcodec/.gitignore                           |   1 +
 librfxcodec/Makefile.am                          |   7 +
 librfxcodec/bootstrap                            |   4 -
 librfxcodec/configure.ac                         |   8 +-
 librfxcodec/rfxcodec-uninstalled.pc.in           |   5 +
 librfxcodec/rfxcodec.pc.in                       |  10 +
 librfxcodec/src/Makefile.am                      |  68 +--
 librfxcodec/tests/Makefile.am                    |  20 +-
 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 -
 67 files changed, 1309 insertions(+), 423 deletions(-)

diff --cc debian/changelog
index 9c75020,699f122..e82a4de
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,36 +1,36 @@@
+ xrdp (0.9.0~20161027+gitc524b06-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Remove unnecessary dh-systemd dependency.
+   * Depend on lsb-base.
+   * Suggest guacamole.
+   * Fix build with OpenSSL 1.1.0. (Closes: #828610)
+ 
+  -- Dominik George <nik at naturalnet.de>  Thu, 27 Oct 2016 22:53:12 +0200
+ 
  xrdp (0.9.0~20161006+git132cc10-1) unstable; urgency=medium
  
 -  * New upstream version.
 -     + Improve many log messages.
 -     + Fixes for build on kfreebsd.
 -     + Fix typos and wording of docs and man pages.
 -     + Fixes to memory allocation and related things.
 -     + Fix in multi-monitor support in x11rdp.
 -     + Fix a segfault in x11rdp.
 -     + Better region rendring code with pixman.
 -     + Fix for issues with non-ASCII characters in clipboard.
 -     + Add advanced SSL options in xrdp.ini
 -       + Disable SSLv2 by default.
 -     + Some keyboard fixes in x11rdp.
 -       + Add en-gb keyboard mapping.
 -     + Fixes to socket handling.
 +  [ Dominik George ]
 +  * New upstream version 0.9.0~20161006+git132cc10
 +     - Improve many log messages.
 +     - Fixes for build on kfreebsd.
 +     - Fix typos and wording of docs and man pages.
 +     - Fixes to memory allocation and related things.
 +     - Fix in multi-monitor support in x11rdp.
 +     - Fix a segfault in x11rdp.
 +     - Better region rendring code with pixman.
 +     - Fix for issues with non-ASCII characters in clipboard.
 +     - Add advanced SSL options in xrdp.ini
 +       - Disable SSLv2 by default.
 +     - Some keyboard fixes in x11rdp.
 +       - Add en-gb keyboard mapping.
 +     - Fixes to socket handling.
    * Refresh quilt patches.
 -  * Be more aggressive when creating /var/run directories.
 -     + Fixes upgrade path from 0.6.1. (Closes: #828868)
 -  * Move old, duplicate pam config to new name.
 -     + Fixes upgrade path from 0.6.1. (Closes: #836583)
 +  * Refresh patches
 +  * Update copyright.
 +  * Move to team maintenance (Debian Edu Packaging Team).
  
 - -- Dominik George <nik at naturalnet.de>  Fri, 07 Oct 2016 01:12:21 +0200
 + -- Mike Gabriel <sunweaver at debian.org>  Fri, 07 Oct 2016 12:50:16 +0200
  
  xrdp (0.9.0~20160601+git703fedd-3) unstable; urgency=medium
  

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



More information about the debian-edu-commits mailing list