[debian-edu-commits] debian-edu/pkg-team/ 151/159: descriptive text overhaul

[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 71d442b5a9bf7ef870ae8aec6c4df3bdb9091553
Author: mirabilos <tg at mirbsd.org>
Date:   Wed Sep 2 19:13:10 2015 +0200

    descriptive text overhaul
---
 README.Debian        |  4 ++--
 changelog            | 11 ++++++-----
 control              | 17 ++++++++++-------
 patches/systemd.diff |  4 ++--
 rules                |  2 +-
 xrdp.init            | 10 +++++-----
 6 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/README.Debian b/README.Debian
index c64c18d..df36a9d 100644
--- a/README.Debian
+++ b/README.Debian
@@ -1,5 +1,5 @@
-Upgrade from xrdp 0.6 (Debian jessie) should be tested (including
-things like conffiles, logfiles, piuparts, etc).
+See xrdp.NEWS for any upgrade notes from xrdp 0.6 (Debian jessie);
+more testing (conffiles, logfiles, piuparts, etc.) is welcome.
 
 Consider using TLS encryption instead of the default RDP encryption,
 but do make sure to test all possible clients, and mind client bugs.
diff --git a/changelog b/changelog
index 5f856ff..16a0caa 100644
--- a/changelog
+++ b/changelog
@@ -1,14 +1,15 @@
 xrdp (0.9.0~git20150902-1~beta1) teckids; urgency=high
 
   * New upstream snapshot, DFSG-free AFAICT TTBOMK
-  * Correct missing $ in sysvinit script
+  * Correct bug in initscript and a spelling mistake upstream
   * Clean up a now-obsolete conffile from xrdp 0.6
-  * Document the /tmp/.xrdp/ issue and precreate it from sysvinit script
   * Fix permissions to connect to xorgxrdp server from xrdp daemon
-  * Correct misspelling of “doesn’t”
-  * Don’t debug to stdout when starting the dæmons
+  * Don’t debug to stdout while starting the dæmons
+  * Move files in user homes into dotfiles using XDG cache dir
+  * Secure paths used by both dæmons
+  * Improve package and service descriptions and other texts
 
- -- Thorsten Glaser <thorsten.glaser at teckids.org>  Wed, 02 Sep 2015 17:25:40 +0200
+ -- Thorsten Glaser <thorsten.glaser at teckids.org>  Wed, 02 Sep 2015 19:11:17 +0200
 
 xrdp (0.9.0~git20150901+dfsg-1~beta1) teckids; urgency=medium
 
diff --git a/control b/control
index 6661453..8dbdd0f 100644
--- a/control
+++ b/control
@@ -25,14 +25,17 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, adduser
 Recommends: xorgxrdp | vnc-server
 Description: Remote Desktop Protocol (RDP) server
  xrdp offers a graphical login to a remote client using
- RDP (the Remote Desktop Protocol). xrdp can either
- connect to a VNC X11 server, another RDP server, or a
- locally created X.org session with the xorgxrdp drivers.
- It provides a fully functional Linux terminal server,
- accepting connections from freerdp, rdesktop, and the
+ RDP (the Remote Desktop Protocol). xrdp can connect to
+ a locally created X.org session with the xorgxrdp drivers,
+ to a VNC X11 server, and forward to another RDP server.
+ .
+ xrdp accepts connections from freerdp, rdesktop, and the
  built-in terminal server / remote desktop clients of
- Microsoft Windows operating systems, offering an X-Window
- desktop to the user.
+ Microsoft Windows operating systems.
+ In the xorgxrdp (which replaces X11RDP) and VNC modes,
+ it provides a fully functional Linux terminal server,
+ offering an X-Window desktop to the user. In the RDP
+ or VNC forwarding mode, any sort of desktop can be used.
 
 Package: xorgxrdp
 Architecture: any
diff --git a/patches/systemd.diff b/patches/systemd.diff
index aca04fa..e9b8775 100644
--- a/patches/systemd.diff
+++ b/patches/systemd.diff
@@ -8,7 +8,7 @@
 -After=syslog.target network.target
 -StopWhenUnneeded=true
 -BindTo=xrdp.service
-+Description=Remote Desktop Protocol (RDP) session manager
++Description=xrdp (X Remote Desktop Protocol) session manager
 +Requires=xrdp.service
 +After=network.target xrdp.service
  
@@ -30,7 +30,7 @@
 -Description=xrdp daemon
 -Requires=xrdp-sesman.service
 -After=syslog.target network.target xrdp-sesman.service
-+Description=Remote Desktop Protocol (RDP) server
++Description=xrdp (X Remote Desktop Protocol) protocol server
 +After=network.target
  
  [Service]
diff --git a/rules b/rules
index 1344fb2..6617224 100755
--- a/rules
+++ b/rules
@@ -41,7 +41,7 @@ override_dh_auto_configure:
 
 override_dh_auto_install:
 	dh_auto_install -v --destdir=debian/xrdp
-	# this file scares me
+	# remove unused/confusing files
 	rm -f debian/xrdp/etc/xrdp/xrdp.sh
 	rm -f debian/xrdp/etc/xrdp/startwm.sh
 	# Policy
diff --git a/xrdp.init b/xrdp.init
index 15ca34c..5ed757d 100644
--- a/xrdp.init
+++ b/xrdp.init
@@ -5,13 +5,13 @@
 # Required-Stop:     $remote_fs $syslog $network
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: xrdp (X Remote Desktop Protocol) server
+# Short-Description: xrdp (X Remote Desktop Protocol) full server
 # Description:       The xrdp daemon uses the Remote Desktop Protocol
 #                    to present a graphical login to a remote client,
-#                    allowing connections to a VNC or X.org-xrdp or
-#                    another RDP server; xrdp-sesman manages user
-#                    sessions: it authenticates the user against PAM
-#                    and starts the appropriate X server, if any.
+#                    allowing connections to an xorgxrdp or VNC server
+#                    or another RDP server. The xrdp-sesman daemon
+#                    authenticates the users against PAM and starts
+#                    the session and, if necessary, X11 server.
 ### END INIT INFO
 #-
 # Copyright © 2015 mirabilos <thorsten.glaser at teckids.org>

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