Package: winetricks
Version: 0.0+20140818+svn1202-1
Followup-For: Bug #758996
I extended the patch to set WINE correctly if wineserver is from wine-
development, committed also upstream.
I moved the wineserver check towards the end of the list to avoid
setting a new
WINE unnecessarily (in case several wineserver are installed).
Further I first check if the new WINE is executable before setting it new.
-- System Information:
Debian Release: jessie/sid
APT prefers testing
APT policy: (900, 'testing'), (300, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.14-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages winetricks depends on:
ii cabextract 1.4-4
ii p7zip 9.20.1~dfsg.1-4.1
ii unzip 6.0-12
ii wget 1.15-1+b1
ii wine-development 1.7.26-2
ii zip 3.0-8
Versions of packages winetricks recommends:
ii gksu 2.0.2-6
ii sudo 1.8.10p3-1
ii xdg-utils 1.1.0~rc1+git20111210-7.1
ii zenity 3.12.1-1.1
Versions of packages winetricks suggests:
pn libwine <none>
-- no debconf information
diff --git a/debian/patches/10-option-gui.patch b/debian/patches/10-option-gui.patch
index 4f7f570..a1a2f69 100644
--- a/debian/patches/10-option-gui.patch
+++ b/debian/patches/10-option-gui.patch
@@ -7,7 +7,7 @@ Subject: Start GUI only when --gui option is used. Handle empty args.
--- a/src/winetricks
+++ b/src/winetricks
-@@ -17897,6 +17897,14 @@
+@@ -18548,6 +18548,14 @@
shift
fi
@@ -22,7 +22,7 @@ Subject: Start GUI only when --gui option is used. Handle empty args.
case "$1" in
die) w_die "we who are about to die salute you." ;;
volnameof=*)
-@@ -17910,7 +17918,7 @@
+@@ -18561,7 +18569,7 @@
# This will read the volname from the given image and put it to stdout.
winetricks_volname ${1#volnameof=}
;;
diff --git a/debian/patches/20-wine-development.patch b/debian/patches/20-wine-development.patch
new file mode 100644
index 0000000..1c1cffc
--- /dev/null
+++ b/debian/patches/20-wine-development.patch
@@ -0,0 +1,38 @@
+From: Jens Reyer <jre.wine...@gmail.com>
+Subject: Check for wineserver from Debian package wine-development and set
+ WINE accordingly.
+
+
+--- a/src/winetricks
++++ b/src/winetricks
+@@ -3720,6 +3720,7 @@
+ WINE="${WINE:-wine}"
+ # Find wineserver. Some distros (Debian) don't have it on the path,
+ # on the mistaken understanding that user scripts never need it :-(
++ # If wineserver is from wine-development set WINE to wine-development.
+ # FIXME: get packagers to put wineserver on the path.
+ for x in \
+ "$WINESERVER" \
+@@ -3735,10 +3736,22 @@
+ /usr/lib/*/wine/wineserver \
+ /usr/lib/*/wine/bin/wineserver \
+ "`dirname $WINE`/server/wineserver" \
++ /usr/lib/i386-kfreebsd-gnu/wine-development/wineserver \
++ /usr/lib/i386-linux-gnu/wine-development/wineserver \
++ /usr/lib/powerpc-linux-gnu/wine-development/wineserver \
++ /usr/lib/x86_64-linux-gnu/wine-development/wineserver \
+ file-not-found
+ do
+ if test -x "$x"
+ then
++ case "$x" in
++ /usr/lib/*/wine-development/wineserver)
++ if test -x /usr/bin/wine-development
++ then
++ WINE="/usr/bin/wine-development"
++ fi
++ ;;
++ esac
+ break
+ fi
+ done
diff --git a/debian/patches/series b/debian/patches/series
index 9099ad2..7d51a9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
10-option-gui.patch
+20-wine-development.patch
