[debian-edu-commits] debian-edu/pkg-team/ 130/159: implement the xorgxrdp package split and hard ABI depends

[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 dd27388860f13ea28349456d34d6bbf31f47b175
Author: mirabilos <t.glaser at tarent.de>
Date:   Tue Sep 1 19:01:21 2015 +0200

    implement the xorgxrdp package split and hard ABI depends
---
 README.Debian |  4 ----
 changelog     |  3 ++-
 control       | 24 +++++++++++++++++-------
 rules         | 19 ++++++++++++++++++-
 4 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/README.Debian b/README.Debian
index 2e3e520..1de657d 100644
--- a/README.Debian
+++ b/README.Debian
@@ -19,10 +19,6 @@ See also: https://github.com/neutrinolabs/xrdp/issues/264
 Furthermore, the package maintainers would like to know what the log
 messages about /etc/xrdp/cert.pem and /etc/xrdp/key.pem are good for.
 
-The xorgxrdp drivers should be moved into a separate binary package
-which Depends on the correct Xorg server ABIs. (Rewrite both binary
-packages’ long Descriptions in the same go!)
-
 The pulseaudio plugin from sesman/chansrv/pulse should be installed
 but cannot be built due to lack of a pulseaudio-modules-dev package
 in Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=794692
diff --git a/changelog b/changelog
index e5edee4..4694efe 100644
--- a/changelog
+++ b/changelog
@@ -8,8 +8,9 @@ xrdp (0.9.0~git20150901+dfsg-1~beta1) teckids; urgency=medium
   [ Thorsten Glaser ]
   * Update from upstream git; drop merged patch
   * Improve service descriptions
+  * Split xorgxrdp into a separate package with appropriate Depends
 
- -- Thorsten Glaser <thorsten.glaser at teckids.org>  Tue, 01 Sep 2015 17:55:27 +0200
+ -- Thorsten Glaser <thorsten.glaser at teckids.org>  Tue, 01 Sep 2015 19:00:55 +0200
 
 xrdp (0.9.0~git20150830+dfsg-1~beta2) teckids; urgency=medium
 
diff --git a/control b/control
index f154149..d1810c8 100644
--- a/control
+++ b/control
@@ -22,16 +22,26 @@ Vcs-Git: https://github.com/teckids/xrdp.git
 Package: xrdp
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, adduser
-Recommends: xorg | vnc4server | tightvncserver | vnc-server
-Provides: xorg-driver-video, xorg-driver-input
+Recommends: xorgxrdp | vnc-server
 Description: Remote Desktop Protocol (RDP) server
- Based on the work by NeutrinoRDP, FreeRDP, rdesktop, and
- Matt Chapman, xrdp offers a graphical login to a remote
- client using RDP (the Remote Desktop Protocol). xrdp can
- connect to either a VNC X11 server, another RDP server,
- or a locally created X.org session with xorgxrdp drivers.
+ 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
  built-in terminal server / remote desktop clients of
  Microsoft Windows operating systems, offering an X-Window
  desktop to the user.
+
+Package: xorgxrdp
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${xdriver:Depends}
+Recommends: xorg
+Provides: xorg-driver-input, xorg-driver-video
+Description: Remote Desktop Protocol (RDP) modules for X.org
+ xorgxrdp is a set of drivers (screen device, keyboard, and mouse)
+ for X.org enabling use through an RDP session with xrdp. For full
+ operation, most standard X11 fonts and tools need to be installed;
+ the Recommended xorg metapackage is a superset of what’s actually
+ needed but will do.
diff --git a/rules b/rules
index f0e45c6..7e792d1 100755
--- a/rules
+++ b/rules
@@ -40,7 +40,7 @@ override_dh_auto_configure:
 	    xargs -0 perl -pi -e 's!XRDP_PID_PATH.*?/run!$$&/xrdp!g' --
 
 override_dh_auto_install:
-	dh_auto_install -v
+	dh_auto_install -v --destdir=debian/xrdp
 	# this file scares me
 	rm -f debian/xrdp/etc/xrdp/xrdp.sh
 	rm -f debian/xrdp/etc/xrdp/startwm.sh
@@ -48,6 +48,10 @@ override_dh_auto_install:
 	find debian/xrdp/ -name \*.la -print0 | xargs -0 rm -f --
 	find debian/xrdp/usr/lib/ -name \*.a -print0 | \
 	    xargs -0 strip --strip-debug -R .comment --
+	# package split
+	mkdir -p debian/xorgxrdp/etc/X11/xrdp debian/xorgxrdp/usr/lib
+	mv debian/xrdp/etc/X11/xrdp/xorg.conf debian/xorgxrdp/etc/X11/xrdp/
+	mv debian/xrdp/usr/lib/xorg debian/xorgxrdp/usr/lib/
 
 override_dh_installinit:
 	dh_installinit --no-restart-on-upgrade
@@ -55,6 +59,19 @@ override_dh_installinit:
 override_dh_systemd_start:
 	dh_systemd_start --no-restart-on-upgrade
 
+override_dh_shlibdeps:
+	# That's a plugin, use appropriate warning level:
+	dh_shlibdeps -pxorgxrdp -- --warnings=6
+	# Use default levels for everything else:
+	dh_shlibdeps --remaining-packages
+
+override_dh_gencontrol:
+	echo "xdriver:Depends=$$( \
+	    (cd /usr/share/xserver-xorg && cat videodrvdep xinputdep) | \
+	    sed 's/, /\n/g' | sort -u | \
+	    perl -0e 'print join(", ", split(/\n/, <>));')"
+	dh_gencontrol
+
 # We don’t provide a get-orig-source target because submodules
 # don’t work with git-archive, and the manual checkout + find
 # way doesn’t work well automatedly either.

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