Package: winetricks
Version: 0.0+20151116-1
Severity: normal
Tags: patch
Hi Joseph,
there were some changes in wine 1.8-2 that are also relevant for winetricks:
- Wine now supports and uses shared WoW64/64-bit wineprefixes if wine,
wine32 and wine64 are installed. We discussed winetricks 64-bit for a
bit on pkg-wine-party, that might be of interest for you/users [1].
- Wine now always defaults to $HOME/.wine (no $HOME/.wine64).
- The wineserver is now /usr/bin/wineserver or
/usr/bin/wineserver-development (when it's implemented there). The old
filepaths of wineserver don't exist anymore.
- /usr/bin/wine and /usr/bin/wineserver are in the package wine.
winetricks upstream already accepted my pull request [2]. This patch
will be needed as soon as wine-development with the recent changes is
uploaded.
For the Debian packaging I suggest to (see also attached patch):
- Remove the README entry of 11 Dec 2015 (wine64-only): It's not needed
anymore, and may even cause errors.
- Update the README entry of 23 Sept 2014 for the new
wineserver-development path.
- Change the dependencies in d/control to only depend on
wine|wineserver. Installations without wine (only wine32 and/or wine64)
do not work anymore.
btw, can you please update
git.debian.org/git/collab-maint/winetricks.git. Alternatively, if you
push to another repository can you update debian/control?
Greets
jre
[1]:
http://lists.alioth.debian.org/pipermail/pkg-wine-party/2015-December/005071.html
http://lists.alioth.debian.org/pipermail/pkg-wine-party/2016-January/005121.html
[2]
commit 3cf3d9a3c0e0920792d481b0c7eb286278e7d51a
Author: Jens Reyer <jre.wine...@gmail.com>
Date: Mon Jan 11 01:31:20 2016 +0100
Adapt to new Debian /usr/bin/wineserver[-development].
-- System Information:
Debian Release: stretch/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (100, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.3.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages winetricks depends on:
ii cabextract 1.6-1
ii p7zip 9.20.1~dfsg.1-4.2
ii unzip 6.0-20
ii wget 1.17.1-1
ii wine 1.8-2
ii wine32 1.8-2
ii wine64 1.8-2
ii zip 3.0-11
Versions of packages winetricks recommends:
ii gksu 2.0.2-9
ii sudo 1.8.15-1.1
ii xdg-utils 1.1.1-1
ii zenity 3.18.1.1-1
Versions of packages winetricks suggests:
ii libwine 1.8-2
-- no debconf information
diff --git a/debian/README.Debian b/debian/README.Debian
index 0bd20f4..f682b2c 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,25 +1,15 @@
-If you only have wine64 installed, run the following commands before
-you run winetricks to use wine64:
-.
- export WINESERVER=/usr/lib/x86_64-linux-gnu/wine/wineserver
- export WINEPREFIX="$HOME/.wine64"
-
- -- Joseph Bisch <joseph.bi...@gmail.com>, Fri, 11 Dec 2015 22:06:45 -0500
-
-If wine is installed, it's wine binary and wineserver are used, even
+If wine is installed, its wine binary and wineserver are used, even
if wine-development is installed. The wine-development wine binary and
wineserver are only used if just wine-development is installed.
.
If you have both wine and wine-development installed and you want to
use the wine-development wine binary and wineserver, you should execute
-the following commands before running winetricks. Make sure to replace
-the * in the WINESERVER line with the appropriate directory based on
-your system's architecture.
+the following commands before running winetricks.
.
export WINE=/usr/bin/wine-development
- export WINESERVER=/usr/lib/*/wine-development/wineserver
+ export WINESERVER=/usr/bin/wineserver-development
- -- Joseph Bisch <joseph.bi...@gmail.com>, Tues, 23 Sept 2014 18:24:42 -0400
+ -- Joseph Bisch <joseph.bi...@gmail.com>, Mon, 11 Jan 2016 02:14:27 +0100
About packages in Recommends header: to use GUI progress bar, install
package "zenity". To read manuals, install package "xdg-utils". If
diff --git a/debian/control b/debian/control
index c342709..52cd76e 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Depends:
p7zip,
unzip,
wget,
- wine32 | wine32-development | wine64 | wine64-development | wine | wine-development,
+ wine | wine-development,
zip,
${misc:Depends}
Recommends:
