control: tags -1 pending
On 04.08.19 01:04, Jens Reyer wrote:
> Gving it another thought: just install wine and call /usr/bin/wine64
> (not wine). This doesn't cause the warning about wine32 afaict. So
> problem solved for you!?
Turned out this isn't true: on updating the wineprefix you still get the
warning.
Anyway, I finally got it working by moving our wineserver script to libwine:
commit 06f7608ee4b21bc0ac44ad876bbd144bdae039a1
Author: Jens Reyer <jre.wine...@gmail.com>
Date: Fri Aug 2 13:37:55 2019 +0200
Move the wineserver script from wine to libwine.
Closes: #932201
This ensures that Wine always finds its wineserver in its bindir.
Otherwise if wine was not installed it might fail to find it, or
fall back to another wineserver in e.g. PATH.
wine{32,64} would be better suited, but dpkg only accepts multiple
packages as owner of a file for "Multi-Arch: same" packages.
diff --git a/debian/control.in b/debian/control.in
index 6ff2203ade..188163060c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -247,6 +247,12 @@ Suggests:
ttf-mscorefonts-installer,
Pre-Depends:
${misc:Pre-Depends},
+Breaks:
+ wine32 (<< 4.0.1-1~),
+ wine64 (<< 4.0.1-1~),
+Replaces:
+ wine32 (<< 4.0.1-1~),
+ wine64 (<< 4.0.1-1~),
Description: Windows API implementation - library
Wine is a free MS-Windows API implementation.
This is still a work in progress and many applications may still not work.
diff --git a/debian/libwineVERSION.install b/debian/libwineVERSION.install
index e1785f603e..2295e336e2 100644
--- a/debian/libwineVERSION.install
+++ b/debian/libwineVERSION.install
@@ -3,3 +3,5 @@ debian/tmp/usr/lib/*/*/fakedlls
debian/tmp/usr/lib/*/*/libwine.so.*
debian/tmp/usr/share/*/wine/*.*
+
+debian/tmp/wineserver usr/lib/wineVERSION
diff --git a/debian/rules b/debian/rules
index e1bce028b9..9fb4f78033 100755
--- a/debian/rules
+++ b/debian/rules
@@ -170,8 +170,6 @@ override_dh_auto_install-indep: $(INSTALLS)
mkdir -p debian/tmp
cp ANNOUNCE debian/tmp/NEWS
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)
@@ -195,6 +193,8 @@ override_dh_auto_install-arch: $(INSTALLS)
cp tools/winedump/README debian/tmp/README.winedump
cp server/wineserver debian/tmp/wineserver$(DEB_BUILD_ARCH_BITS)
sed "s|BINDIR|$(BINDIR)|g" debian/scripts/winegcc.in >
debian/tmp/winegcc$(DEBSUFFIX)
+ sed "s|BINDIR|$(BINDIR)|g;s|VERSION|$(VERSION)|g"
debian/scripts/wineserver.in > debian/tmp/wineserver
+ chmod 755 debian/tmp/wineserver
dh_auto_install
for file in $$(find . ! -path "./debian/*" -name \*.man); do \
rename=$$(basename $$file | sed
"s/\\./$(DEBSUFFIX)./;s/UTF-8\\.//"); \
diff --git a/debian/scripts/wineserver.in b/debian/scripts/wineserver.in
index f105fcf474..b420ea6569 100644
--- a/debian/scripts/wineserver.in
+++ b/debian/scripts/wineserver.in
@@ -8,7 +8,8 @@ if test -x "$wineserver64"; then
elif test -x "$wineserver32"; then
wineserver=$wineserver32
else
- echo "error: unable to find wineserver executable. this shouldn't
happen." >&2
+ echo "error: unable to find wineserver executable." >&2
+ echo "wine32VERSION and/or wine64VERSION must be installed." >&2
exit 1
fi
diff --git a/debian/wineVERSION.install b/debian/wineVERSION.install
index 482568c1c6..ca605f8857 100644
--- a/debian/wineVERSION.install
+++ b/debian/wineVERSION.install
@@ -1,5 +1,4 @@
debian/tmp/wineDEBSUFFIX usr/bin
-debian/tmp/wineserver usr/lib/wineVERSION
debian/tmp/wineapploader usr/lib/wineVERSION
debian/tmp/wineDEBSUFFIX.svg usr/share/icons/hicolor/scalable/apps/
