[debian-edu-commits] debian-edu/pkg-team/ 132/159: some fixes

[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 4dfbdd31bdcaad364f73c507f54e2bec006dadf2
Author: mirabilos <t.glaser at tarent.de>
Date:   Tue Sep 1 19:20:41 2015 +0200

    some fixes
---
 rules | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules b/rules
index 7e792d1..d30c40d 100755
--- a/rules
+++ b/rules
@@ -49,8 +49,8 @@ override_dh_auto_install:
 	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/
+	mkdir -p debian/xorgxrdp/etc debian/xorgxrdp/usr/lib
+	mv debian/xrdp/etc/X11 debian/xorgxrdp/etc/
 	mv debian/xrdp/usr/lib/xorg debian/xorgxrdp/usr/lib/
 
 override_dh_installinit:
@@ -66,7 +66,7 @@ override_dh_shlibdeps:
 	dh_shlibdeps --remaining-packages
 
 override_dh_gencontrol:
-	echo "xdriver:Depends=$$( \
+	echo >>debian/xorgxrdp.substvars "xdriver:Depends=$$( \
 	    (cd /usr/share/xserver-xorg && cat videodrvdep xinputdep) | \
 	    sed 's/, /\n/g' | sort -u | \
 	    perl -0e 'print join(", ", split(/\n/, <>));')"

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