[pkg-wine-party] [wine] 02/02: Move Wine binaries to common directory.

Jens Reyer jreyer-guest at moszumanska.debian.org
Fri Feb 5 04:48:46 UTC 2016 

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

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

commit e3a8b8a90d62493f0097e4ff0d560743ca312c03
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Fri Feb 5 05:47:38 2016 +0100

    Move Wine binaries to common directory.
    
    This fixes the WoW64 setup for wine-development (closes: #813475).
    
    Wine first looks in its bindir for the loaders and the server.
    This bindir seems to be the dirname of the calling executable. So
    if wine, wine64 and wineserver are in the same directory, they
    are automatically found.
    
    This bindir needs to be in the same file hierarchy level as the
    bindir specified on package build, to prevent broken wine
    internal links like /usr/lib/wine-development/../../../share/
    wine-development/wine/wine.inf.
    
    Therefore:
    Move everything in /usr/lib/wineVERSION to new subdir wine.
    Move adjusted wine and wineserver scripts to this dir, and create
    links in /usr/bin.
    Don't specify WINELOADER and WINESERVER explicitly.
---
 debian/rules                                     |  2 --
 debian/scripts/wine                              | 12 ++----------
 debian/scripts/wineserver                        |  8 ++++----
 debian/wine32VERSION-preloader.install           |  2 +-
 debian/wine32VERSION-preloader.lintian-overrides |  2 +-
 debian/wine32VERSION.install                     |  4 ++--
 debian/wine32VERSION.links                       |  2 +-
 debian/wine64VERSION-preloader.install           |  2 +-
 debian/wine64VERSION-preloader.lintian-overrides |  2 +-
 debian/wine64VERSION.install                     |  4 ++--
 debian/wine64VERSION.links                       |  2 +-
 debian/wineVERSION.install                       |  7 +++----
 debian/wineVERSION.links                         | 19 +++++++++++--------
 13 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/debian/rules b/debian/rules
index 8a4cdcb..47d994a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,8 +108,6 @@ 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)
-	cp debian/scripts/wineserver debian/tmp/wineserver$(VERSION)
 	for dir in loader server programs/msiexec programs/winedbg \
 	    programs/wineconsole programs/regedit programs/regsvr32 \
 	    programs/wineboot programs/winefile programs/winecfg; do \
diff --git a/debian/scripts/wine b/debian/scripts/wine
index f8f5872..1f0ae9d 100755
--- a/debian/scripts/wine
+++ b/debian/scripts/wine
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
-script=$(basename $0)
-bindir=/usr/lib/$script
+script="$(dirname $(readlink -f $0) | cut -d/ -f4)"
+bindir="$(dirname $(readlink -f $0))"
 
 wine32=$bindir/wine32
 wine64=$bindir/wine64
@@ -21,14 +21,6 @@ else
     exit 1
 fi
 
-if test -z "$WINELOADER"; then
-    export WINELOADER=/usr/bin/wine-development
-fi
-
-if test -z "$WINESERVER"; then
-    export WINESERVER=/usr/bin/wineserver-development
-fi
-
 if test -z "$WINEDEBUG"; then
     export WINEDEBUG=-all
 fi
diff --git a/debian/scripts/wineserver b/debian/scripts/wineserver
index a444a40..c5865f7 100755
--- a/debian/scripts/wineserver
+++ b/debian/scripts/wineserver
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
-name="$(basename $0|sed s/server//)"
-bindir=/usr/lib/$name
+script="$(dirname $(readlink -f $0) | cut -d/ -f4)"
+bindir="$(dirname $(readlink -f $0))"
 
 wineserver32=$bindir/wineserver32
 wineserver64=$bindir/wineserver64
@@ -19,8 +19,8 @@ dist=$(cat /etc/debian_version)
 arch=$(dpkg --print-architecture)
 version=$($wineserver --version 2>&1 | cut -d- -f2)
 
-echo "Executing $name ($(basename $wineserver)) $version on Debian $dist ($arch)."
-echo "If something goes wrong, please rerun with \"WINEDEBUG=err+all $name\""
+echo "Executing $script ($(basename $wineserver)) $version on Debian $dist ($arch)."
+echo "If something goes wrong, please rerun with \"WINEDEBUG=err+all $script\""
 echo "for more detailed debugging output."
 
 exec $wineserver -p0 "$@"
diff --git a/debian/wine32VERSION-preloader.install b/debian/wine32VERSION-preloader.install
index d0b04de..b15f338 100644
--- a/debian/wine32VERSION-preloader.install
+++ b/debian/wine32VERSION-preloader.install
@@ -1 +1 @@
-usr/lib/*/*/wine-preloader usr/lib/wineVERSION
+usr/lib/*/*/wine-preloader usr/lib/wineVERSION/wine
diff --git a/debian/wine32VERSION-preloader.lintian-overrides b/debian/wine32VERSION-preloader.lintian-overrides
index 9ec1c2c..f3d7193 100644
--- a/debian/wine32VERSION-preloader.lintian-overrides
+++ b/debian/wine32VERSION-preloader.lintian-overrides
@@ -1,2 +1,2 @@
 # preloader binary is statically linked by definition
-statically-linked-binary usr/lib/wineVERSION/wine-preloader
+statically-linked-binary usr/lib/wineVERSION/wine/wine-preloader
diff --git a/debian/wine32VERSION.install b/debian/wine32VERSION.install
index 3c27e14..88ad6fa 100644
--- a/debian/wine32VERSION.install
+++ b/debian/wine32VERSION.install
@@ -1,2 +1,2 @@
-debian/tmp/wine32 usr/lib/wineVERSION
-debian/tmp/wineserver32 usr/lib/wineVERSION
+debian/tmp/wine32 usr/lib/wineVERSION/wine
+debian/tmp/wineserver32 usr/lib/wineVERSION/wine
diff --git a/debian/wine32VERSION.links b/debian/wine32VERSION.links
index fccc38c..a8b973a 100644
--- a/debian/wine32VERSION.links
+++ b/debian/wine32VERSION.links
@@ -1 +1 @@
-usr/lib/wineVERSION/wine32 usr/bin/wine32VERSION
+usr/lib/wineVERSION/wine/wine32 usr/bin/wine32VERSION
diff --git a/debian/wine64VERSION-preloader.install b/debian/wine64VERSION-preloader.install
index 5e40ca0..9a1dfc9 100644
--- a/debian/wine64VERSION-preloader.install
+++ b/debian/wine64VERSION-preloader.install
@@ -1 +1 @@
-usr/lib/*/*/wine64-preloader usr/lib/wineVERSION
+usr/lib/*/*/wine64-preloader usr/lib/wineVERSION/wine
diff --git a/debian/wine64VERSION-preloader.lintian-overrides b/debian/wine64VERSION-preloader.lintian-overrides
index 6492218..4fc84d7 100644
--- a/debian/wine64VERSION-preloader.lintian-overrides
+++ b/debian/wine64VERSION-preloader.lintian-overrides
@@ -1,2 +1,2 @@
 # preloader binary is statically linked by definition
-statically-linked-binary usr/lib/wineVERSION/wine64-preloader
+statically-linked-binary usr/lib/wineVERSION/wine/wine64-preloader
diff --git a/debian/wine64VERSION.install b/debian/wine64VERSION.install
index 29dcfc7..0b45c3f 100644
--- a/debian/wine64VERSION.install
+++ b/debian/wine64VERSION.install
@@ -1,2 +1,2 @@
-debian/tmp/wine64 usr/lib/wineVERSION
-debian/tmp/wineserver64 usr/lib/wineVERSION
+debian/tmp/wine64 usr/lib/wineVERSION/wine
+debian/tmp/wineserver64 usr/lib/wineVERSION/wine
diff --git a/debian/wine64VERSION.links b/debian/wine64VERSION.links
index a35d012..b8114f1 100644
--- a/debian/wine64VERSION.links
+++ b/debian/wine64VERSION.links
@@ -1 +1 @@
-usr/lib/wineVERSION/wine64 usr/bin/wine64VERSION
+usr/lib/wineVERSION/wine/wine64 usr/bin/wine64VERSION
diff --git a/debian/wineVERSION.install b/debian/wineVERSION.install
index 3d3d7c9..f1e1139 100644
--- a/debian/wineVERSION.install
+++ b/debian/wineVERSION.install
@@ -1,4 +1,3 @@
-debian/tmp/wineVERSION usr/bin
-debian/tmp/wineserverVERSION usr/bin
-
-debian/scripts/wineapploader usr/lib/wineVERSION
+debian/scripts/wine usr/lib/wineVERSION/wine
+debian/scripts/wineserver usr/lib/wineVERSION/wine
+debian/scripts/wineapploader usr/lib/wineVERSION/wine
diff --git a/debian/wineVERSION.links b/debian/wineVERSION.links
index bda9ccc..a18676e 100644
--- a/debian/wineVERSION.links
+++ b/debian/wineVERSION.links
@@ -1,8 +1,11 @@
-usr/lib/wineVERSION/wineapploader usr/bin/msiexecVERSION
-usr/lib/wineVERSION/wineapploader usr/bin/regeditVERSION
-usr/lib/wineVERSION/wineapploader usr/bin/winecfgVERSION
-usr/lib/wineVERSION/wineapploader usr/bin/winedbgVERSION
-usr/lib/wineVERSION/wineapploader usr/bin/winebootVERSION
-usr/lib/wineVERSION/wineapploader usr/bin/winefileVERSION
-usr/lib/wineVERSION/wineapploader usr/bin/regsvr32VERSION
-usr/lib/wineVERSION/wineapploader usr/bin/wineconsoleVERSION
+usr/lib/wineVERSION/wine/wine usr/bin/wineVERSION
+usr/lib/wineVERSION/wine/wineserver usr/bin/wineserverVERSION
+
+usr/lib/wineVERSION/wine/wineapploader usr/bin/msiexecVERSION
+usr/lib/wineVERSION/wine/wineapploader usr/bin/regeditVERSION
+usr/lib/wineVERSION/wine/wineapploader usr/bin/winecfgVERSION
+usr/lib/wineVERSION/wine/wineapploader usr/bin/winedbgVERSION
+usr/lib/wineVERSION/wine/wineapploader usr/bin/winebootVERSION
+usr/lib/wineVERSION/wine/wineapploader usr/bin/winefileVERSION
+usr/lib/wineVERSION/wine/wineapploader usr/bin/regsvr32VERSION
+usr/lib/wineVERSION/wine/wineapploader usr/bin/wineconsoleVERSION

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

More information about the pkg-wine-party mailing list