[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4.1-3-8-g02fd44b

[Hilko Bengen]

The following commit has been merged in the wheezy branch:
commit cd5cef99941778c485ad7116bc55e6ae651ac79d
Author: Hilko Bengen <bengen at debian.org>
Date:   Sat Jul 7 17:12:14 2012 +0200

    wine64-bin: Use xmessage (with fallback to console) for multiarch instructions

diff --git a/debian/control.in b/debian/control.in
index ba4a915..bf4e56c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -84,6 +84,8 @@ Description: Windows API implementation - binary loader
 
 Package: wine64-bin
 Architecture: any-amd64
+Depends: ${misc:Depends},
+ x11-utils,
 Conflicts:
  wine-bin,
 Description: Windows API implementation - binary loader
diff --git a/debian/wine64.sh b/debian/wine64.sh
old mode 100644
new mode 100755
index f3d0d84..95db67e
--- a/debian/wine64.sh
+++ b/debian/wine64.sh
@@ -1,24 +1,41 @@
 #!/bin/sh
 
-arch=$(dpkg --print-architecture | sed s/amd64/i386/)
-
-echo "This is the wine64-bin helper package, which does not provide wine itself,"
-echo "but instead exists solely to provide the following information about"
-echo "enabling multiarch on your system in order to be able to install and run"
-echo "the 32-bit wine packages."
-echo ""
-echo "The following commands should be issued as root or via sudo in order to"
-echo "enable multiarch (the last command installs 32-bit wine):"
-echo ""
-echo "  # dpkg --add-architecture $arch"
-echo "  # apt-get update"
-echo "  # apt-get install wine-bin:$arch"
-echo ""
-echo "Depending on which Debian release is present on this system, the development"
-echo "version of wine may be available, which if available can be installed with:"
-echo ""
-echo "  # apt-get install wine-bin-unstable:$arch"
-echo ""
-echo "Note that this package (wine64-bin) will be removed in the process.  For"
-echo "more information on the multiarch conversion, see:"
-echo "http://wiki.debian.org/Multiarch/HOWTO"
+XMESSAGE=/usr/bin/xmessage
+ARCH="`dpkg --print-architecture`"
+ARCH_I386="`echo $ARCH | sed s,amd64,i386,`"
+
+TITLE="Debian / Wine: Multiarch Instructions"
+
+I386_MSG=\
+"This is the wine64-bin helper package, which does not provide wine itself,
+but instead exists solely to provide the following information about
+enabling multiarch on your system in order to be able to install and run
+the 32-bit wine packages.
+
+The following commands should be issued as root or via sudo in order to
+enable multiarch (the last command installs 32-bit wine):
+
+  # dpkg --add-architecture ${ARCH_I386}
+  # apt-get update
+  # apt-get install wine-bin:${ARCH_I386}
+
+Be very careful as spaces matter above.  Note that this package
+(wine64-bin) will be removed in the process.  For more information on
+the multiarch conversion, see: http://wiki.debian.org/Multiarch/HOWTO"
+
+$XMESSAGE -center \
+    -buttons ok:0 -default ok \
+    -title "$TITLE" \
+    "$I386_MSG" 2>/dev/null
+notify=$?
+if [ $notify -eq 1 ] ; then
+    # xmessage was unable to notify the user, try tty instead
+    echo "** $TITLE **"
+    echo "" >&2
+    echo "$I386_MSG" >&2
+    echo "" >&2
+    echo -n "(okay) " >&2
+    read confirm
+fi
+
+exit 1

-- 
Debian Wine packaging