[pkg-wine-party] [wine] 06/18: Generate static wineserver script.

[Jens Reyer]

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

jreyer-guest pushed a commit to branch stretch
in repository wine.

commit f27b8dd60c13b4ecc30ae6c1af7eaa93ce80c088
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Thu Jun 16 23:56:21 2016 +0200

    Generate static wineserver script.
---
 debian/rules               | 2 ++
 debian/scripts/wineserver  | 6 ++----
 debian/wineVERSION.install | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 076a90b..aa4b28b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -127,6 +127,8 @@ override_dh_auto_install-indep: $(INSTALLS)
 	mkdir -p debian/tmp
 	cp ANNOUNCE debian/tmp/changelog
 	cp programs/winedbg/README debian/tmp/README.winedbg
+	sed "s|BINDIR|$(BINDIR)|g" debian/scripts/wineserver.in > debian/tmp/wineserver
+	chmod 755 debian/tmp/wineserver
 	sed "s|DEBSUFFIX|$(DEBSUFFIX)|g" debian/scripts/wineapploader.in > debian/tmp/wineapploader
 	chmod 755 debian/tmp/wineapploader
 	sed "s|BINDIR|$(BINDIR)|g;s|VERSION|$(VERSION)|g" debian/scripts/wine.in > debian/tmp/wine$(DEBSUFFIX)
diff --git a/debian/scripts/wineserver b/debian/scripts/wineserver
index 16d44b5..f105fcf 100755
--- a/debian/scripts/wineserver
+++ b/debian/scripts/wineserver
@@ -1,9 +1,7 @@
 #!/bin/sh -e
 
-bindir="$(dirname $(readlink -f $0))"
-
-wineserver32=$bindir/wineserver32
-wineserver64=$bindir/wineserver64
+wineserver32=/BINDIR/wineserver32
+wineserver64=/BINDIR/wineserver64
 
 if test -x "$wineserver64"; then
     wineserver=$wineserver64
diff --git a/debian/wineVERSION.install b/debian/wineVERSION.install
index cfe68d7..ec8b769 100644
--- a/debian/wineVERSION.install
+++ b/debian/wineVERSION.install
@@ -1,4 +1,4 @@
 debian/tmp/wineDEBSUFFIX usr/bin
+debian/tmp/wineserver usr/lib/wineVERSION
 debian/tmp/wineapploader usr/lib/wineVERSION
 
-debian/scripts/wineserver usr/lib/wineVERSION

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