[debian-edu-commits] debian-edu/pkg-team/ 36/159: use our own startwm.sh

[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 5fe1b1a4acf5a6db55ea1b4288cb252b80685171
Author: mirabilos <tg at mirbsd.org>
Date:   Wed Aug 5 21:51:32 2015 +0200

    use our own startwm.sh
---
 README.source       | 2 --
 patches/config.diff | 8 --------
 rules               | 1 +
 startwm.sh          | 8 ++++++++
 xrdp.install        | 1 +
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.source b/README.source
index 319626c..68e999c 100644
--- a/README.source
+++ b/README.source
@@ -1,7 +1,5 @@
 TODO:
 
-- patch debian/xrdp/etc/xrdp/startwm.sh
-
 - provide Debian init system integration
   * systemd
   * sysvinit
diff --git a/patches/config.diff b/patches/config.diff
index 0ef771a..4f80286 100644
--- a/patches/config.diff
+++ b/patches/config.diff
@@ -1,13 +1,5 @@
 # DP: config patches for Debian
 
---- a/sesman/startwm.sh
-+++ b/sesman/startwm.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- 
- #start the window manager
- wm_start()
 --- a/xorgxrdp/xrdpdev/xorg.conf
 +++ b/xorgxrdp/xrdpdev/xorg.conf
 @@ -12,10 +12,9 @@ Section "ServerFlags"
diff --git a/rules b/rules
index 5fd4760..2e5de4b 100755
--- a/rules
+++ b/rules
@@ -37,6 +37,7 @@ override_dh_auto_install:
 	dh_auto_install -v
 	# this file scares me
 	rm -f debian/xrdp/etc/xrdp/xrdp.sh
+	rm -f debian/xrdp/etc/xrdp/startwm.sh
 	# we provide our own integration
 	rm -rf debian/xrdp/lib/systemd
 	# Policy
diff --git a/startwm.sh b/startwm.sh
new file mode 100644
index 0000000..4c727a5
--- /dev/null
+++ b/startwm.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if test -r /etc/default/locale; then
+	. /etc/default/locale
+	export LANG LANGUAGE
+fi
+
+. /etc/X11/Xsession
diff --git a/xrdp.install b/xrdp.install
new file mode 100644
index 0000000..a52d82d
--- /dev/null
+++ b/xrdp.install
@@ -0,0 +1 @@
+debian/startwm.sh etc/xrdp/

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