[pkg-remote-commits] [xrdp] 11/19: Allow user profile to override /etc/default/locale.

[Thorsten Glaser]

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

tg pushed a commit to branch master
in repository xrdp.

commit 97fd9319714355cdc17d7c3742b3cc3c2d1ec61d
Author: mirabilos <thorsten.glaser at teckids.org>
Date:   Fri Dec 22 16:47:04 2017 +0100

    Allow user profile to override /etc/default/locale.
    
    This is a follow-up fix for commit db0a9c73.
---
 debian/changelog  |  7 ++++++-
 debian/startwm.sh | 10 +++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fd7ee82..b94d586 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 xrdp (0.9.4-4) unstable; urgency=high
 
+  [ Dominik George ]
   * Fix (possibly exploitable) high CPU load in ssl_tls_accept.
     (Closes: #884453)
   * Source /etc/profile in startwm. (Closes: #882246)
@@ -7,7 +8,11 @@ xrdp (0.9.4-4) unstable; urgency=high
   * Update README.Debian.
   * Update bug report instructions.
 
- -- Dominik George <nik at naturalnet.de>  Fri, 15 Dec 2017 11:31:14 +0100
+  [ Thorsten Glaser ]
+  * Allow user profile to override /etc/default/locale.
+  * Upload to unstable, next upload is likely to idle in NEW for a bit.
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Fri, 22 Dec 2017 16:46:21 +0100
 
 xrdp (0.9.4-3) unstable; urgency=high
 
diff --git a/debian/startwm.sh b/debian/startwm.sh
index 9341fae..9ab3f5d 100755
--- a/debian/startwm.sh
+++ b/debian/startwm.sh
@@ -1,11 +1,7 @@
 #!/bin/sh
-# xrdp X session start script (c) 2015 mirabilos
+# xrdp X session start script (c) 2015, 2017 mirabilos
 # published under The MirOS Licence
 
-if test -r /etc/profile; then
-	. /etc/profile
-fi
-
 if test -r /etc/default/locale; then
 	. /etc/default/locale
 	test -z "${LANG+x}" || export LANG
@@ -26,5 +22,9 @@ if test -r /etc/default/locale; then
 	test -z "${LOCPATH+x}" || export LOCPATH
 fi
 
+if test -r /etc/profile; then
+	. /etc/profile
+fi
+
 test -x /etc/X11/Xsession && exec /etc/X11/Xsession
 exec /bin/sh /etc/X11/Xsession

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