[pkg-wine-party] [wine] 06/15: Install the 32-bit wine loader directly as bindir/wine.

[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 24480c552c8c36d0782e79646a03077115caee02
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Sun Feb 7 04:15:05 2016 +0100

    Install the 32-bit wine loader directly as bindir/wine.
    
    Otherwise the preloader, if installed, seems to have problems:
      /usr/lib/wine-development/wine: failed to read ELF header
    
    Restore the wine script as /usr/bin/wineVERSION. If the 32-bit
    wine is missing, export the WINELOADER wine64 to avoid a fallback
    to /usr/bin/wine as loader.
    
    Drop the wine32 link in /usr/bin, since we don't have a binary
    named wine32 anymore.
---
 debian/rules                 | 3 +--
 debian/scripts/wine          | 9 ++++++---
 debian/wine32VERSION.install | 2 +-
 debian/wine32VERSION.links   | 1 -
 debian/wine64VERSION.install | 2 +-
 debian/wineVERSION.install   | 3 ++-
 debian/wineVERSION.links     | 1 -
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/rules b/debian/rules
index 1711d0c..c02ca98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -109,6 +109,7 @@ override_dh_auto_install-indep: $(INSTALLS)
 	mkdir -p debian/tmp
 	cp ANNOUNCE debian/tmp/changelog
 	cp programs/winedbg/README debian/tmp/README.winedbg
+	cp debian/scripts/wine debian/tmp/wine$(VERSION)
 	for dir in loader server programs/msiexec programs/winedbg \
 	    programs/wineconsole programs/regedit programs/regsvr32 \
 	    programs/wineboot programs/winefile programs/winecfg; do \
@@ -125,8 +126,6 @@ override_dh_auto_install-indep: $(INSTALLS)
 override_dh_auto_install-arch: $(INSTALLS)
 	mkdir -p debian/tmp
 	cp ANNOUNCE debian/tmp/changelog
-	cp loader/wine debian/tmp/wine32 || true
-	cp loader/wine64 debian/tmp/wine64 || true
 	cp tools/winedump/README debian/tmp/README.winedump
 	cp server/wineserver debian/tmp/wineserver$(DEB_BUILD_ARCH_BITS)
 	dh_auto_install
diff --git a/debian/scripts/wine b/debian/scripts/wine
index fe4dda7..aa95127 100755
--- a/debian/scripts/wine
+++ b/debian/scripts/wine
@@ -1,15 +1,18 @@
 #!/bin/sh -e
 
-script="$(dirname $(readlink -f $0) | cut -d/ -f4)"
-bindir="$(dirname $(readlink -f $0))"
+script=$(basename $0)
+bindir=/usr/lib/$script
 
-wine32=$bindir/wine32
+wine32=$bindir/wine
 wine64=$bindir/wine64
 
 if test -x $wine32; then
     wine=$wine32
 elif test -x $wine64; then
     wine=$wine64
+    if test -z "$WINELOADER"; then
+        export WINELOADER=$wine64
+    fi
     if [ "$(dpkg --print-architecture)" = "amd64" -a "$(dpkg --print-foreign-architectures | grep -cx "i386")" -ne 1 ] ||
        [ "$WINEARCH" = "win32" ]; then
         echo "it looks like multiarch needs to be enabled.  as root, please" >&2
diff --git a/debian/wine32VERSION.install b/debian/wine32VERSION.install
index 3c27e14..98e4abe 100644
--- a/debian/wine32VERSION.install
+++ b/debian/wine32VERSION.install
@@ -1,2 +1,2 @@
-debian/tmp/wine32 usr/lib/wineVERSION
+usr/lib/wineVERSION/wine
 debian/tmp/wineserver32 usr/lib/wineVERSION
diff --git a/debian/wine32VERSION.links b/debian/wine32VERSION.links
deleted file mode 100644
index fccc38c..0000000
--- a/debian/wine32VERSION.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/wineVERSION/wine32 usr/bin/wine32VERSION
diff --git a/debian/wine64VERSION.install b/debian/wine64VERSION.install
index 29dcfc7..b9bbff4 100644
--- a/debian/wine64VERSION.install
+++ b/debian/wine64VERSION.install
@@ -1,2 +1,2 @@
-debian/tmp/wine64 usr/lib/wineVERSION
+usr/lib/wineVERSION/wine64
 debian/tmp/wineserver64 usr/lib/wineVERSION
diff --git a/debian/wineVERSION.install b/debian/wineVERSION.install
index 4ccd65a..7e54516 100644
--- a/debian/wineVERSION.install
+++ b/debian/wineVERSION.install
@@ -1,3 +1,4 @@
-debian/scripts/wine usr/lib/wineVERSION
+debian/tmp/wineVERSION usr/bin
+
 debian/scripts/wineserver usr/lib/wineVERSION
 debian/scripts/wineapploader usr/lib/wineVERSION
diff --git a/debian/wineVERSION.links b/debian/wineVERSION.links
index 870a8cd..1481c99 100644
--- a/debian/wineVERSION.links
+++ b/debian/wineVERSION.links
@@ -1,4 +1,3 @@
-usr/lib/wineVERSION/wine usr/bin/wineVERSION
 usr/lib/wineVERSION/wineserver usr/bin/wineserverVERSION
 
 usr/lib/wineVERSION/wineapploader usr/bin/msiexecVERSION

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