[pkg-wine-party] [wine] 108/114: Document generating 32-bit results with the -tools packages.

[Jens Reyer]

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

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

commit a2a42d6d985f48c6fa87549b701e9f10797faf02
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Sun Jun 5 19:13:52 2016 +0200

    Document generating 32-bit results with the -tools packages.
    
    See: #824673
    Thanks: Andrey Gursky and Javier Serrano Polo
    
    # Conflicts:
    #	debian/changelog
---
 debian/README.debian | 23 ++++++++++++++++++++---
 debian/changelog     |  2 ++
 debian/control.in    |  6 ++++--
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/debian/README.debian b/debian/README.debian
index a32409d..044a2fd 100644
--- a/debian/README.debian
+++ b/debian/README.debian
@@ -65,8 +65,8 @@ setup with "rm -rf ~/.wine". This will destroy everything you've installed,
 including configuration and data files, so if you have anything important,
 please back it up first. You can then start fresh.
 
-32-/64-bit
-==========
+Running 32-bit Windows applications on 64-bit systems
+=====================================================
 Most Windows binaries are 32-bit applications. You need to install wine32 (or
 wine32-development) to run them. wine64 (or wine64-development) alone cannot do
 this.
@@ -78,7 +78,7 @@ wine32-development). As root, execute e.g.:
 
 If you have wine32 and wine64 (or wine32-development and wine64-development)
 installed, Wine will default to a shared 64-bit prefix that runs most 32-bit
-Windows applications.
+Windows applications (WoW64).
 
 If this causes problems for an application, you may create a 32-bit prefix by
 running e.g.:
@@ -92,6 +92,23 @@ $ WINEPREFIX="$HOME/.wine32" wine-development application.exe
 If you don't want 64-bit at all, just uninstall wine64 (or
 wine-64-development).
 
+32-bit results from the tools (winegcc, ...) on 64-bit systems
+==============================================================
+You may generate 32-bit results with the programs in wine32-tools (or
+wine32-development-tools) as well as with those in wine64-tools (or
+wine64-development-tools).
+
+Enable multiarch (see above). Than install the matching 32-bit Wine development
+files. As root, execute e.g. on amd64:
+# apt install libwine-dev:i386
+# apt install libwine-development-dev:i386
+
+Use the programs with the option "-m32" (for winemaker --wine32). If you are
+using wine64(-development)-tools specify the arch-specific path to some files
+additionally, e.g.:
+$ winegcc -m32 -L/usr/lib/i386-linux-gnu/wine ...
+$ winegcc-development -m32 -L/usr/lib/i386-linux-gnu/wine-development ...
+
 Wine Gecko
 ==========
 The downloader for Wine Gecko is intentionally disabled in the Debian packages.
diff --git a/debian/changelog b/debian/changelog
index dbfdcac..1e7ecab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ wine (1.8.2-2) UNRELEASED; urgency=medium
     - Make wineNN-tools multi-arch installable (closes: #823264,
       see: #824673). Thanks to Javier Serrano Polo.
     - Let libwine-dev prefer wine64-tools to wine32-tools.
+    - Document generating 32-bit results with the -tools packages.
+      Thanks to Andrey Gursky and Javier Serrano Polo.
 
  -- Jens Reyer <jre.winesim at gmail.com>  Mon, 06 Jun 2016 03:35:43 +0200
 
diff --git a/debian/control.in b/debian/control.in
index 598694e..2c3cae8 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -188,7 +188,8 @@ Description: Windows API implementation - 32-bit developer tools
  Wine is a free MS-Windows API implementation.
  This is still a work in progress and many applications may still not work.
  .
- This package provides Wine's 32-bit developer tools.
+ This package provides Wine's 32-bit developer tools. They are capable of
+ generating 32-bit results.
 
 Package: wine64VERSION-tools
 Architecture: amd64 arm64
@@ -210,7 +211,8 @@ Description: Windows API implementation - 64-bit developer tools
  Wine is a free MS-Windows API implementation.
  This is still a work in progress and many applications may still not work.
  .
- This package provides Wine's 64-bit developer tools.
+ This package provides Wine's 64-bit developer tools. They are capable of
+ generating both 32- and 64-bit results.
 
 Package: fonts-wineVERSION
 Section: fonts

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