[pkg-remote-commits] [xrdp] 02/03: Merge branch 'master' of git.debian.org:/git/pkg-remote/xrdp

[Dominik George]

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

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

commit 73b08c0f6be410d5ffe4a58576f813d364ed2bdc
Merge: c4c14e8 e174300
Author: Dominik George <nik at naturalnet.de>
Date:   Wed Jan 25 18:02:05 2017 +0100

    Merge branch 'master' of git.debian.org:/git/pkg-remote/xrdp

 debian/changelog             |  5 ++-
 debian/control               |  3 +-
 debian/patches/lfs.diff      | 73 ++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series        |  1 +
 debian/patches/sockpath.diff | 28 ++++++++---------
 debian/rules                 | 22 +++++++++++++
 6 files changed, 116 insertions(+), 16 deletions(-)

diff --cc debian/changelog
index 1c885f3,22ffa5a..34cc92b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -10,9 -13,8 +13,9 @@@ xrdp (0.9.1-4) unstable; urgency=hig
  
    [ Dominik George ]
    * Update/minimise systemd service file patch.
 +    + Also moves sockpath related part to sockpath patch.
  
-  -- Dominik George <nik at naturalnet.de>  Wed, 25 Jan 2017 16:29:23 +0100
+  -- Thorsten Glaser <tg at mirbsd.de>  Wed, 25 Jan 2017 16:44:44 +0100
  
  xrdp (0.9.1-3) unstable; urgency=medium
  

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