[pkg-wine-party] [wine] 08/12: Make wineNN-tools multi-arch installable.

[Jens Reyer]

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

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

commit 5854b7a988c4c4da97a5fec59058027a24544dfd
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Sun Jun 5 16:29:31 2016 +0200

    Make wineNN-tools multi-arch installable.
    
    Closes: #824673
    Closes: #823264 (stable)
    Thanks: Javier Serrano Polo
    
    Add alternative dependencies to wine32-tools (i386 only) and make
    it M-A:foreign, so amd64 packages can depend on it.
    
    Note: perl:Depends resolves to only one value (perl or perlapi),
    so there's currently no risk of a malformed expression. A general
    fix has been requested in #824696 (debhelper: dh_perl should
    report perl:any when usage is architecture independent).
    
    Also make wine64-tools M-A:foreign, so 32-bit libwine-dev can
    depend on it.
---
 debian/changelog  | 2 ++
 debian/control.in | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7ffa1a6..dec2fcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ wine-development (1.9.11-2) UNRELEASED; urgency=medium
     - Don't error out on build warnings.
   * Drop useless workaround for one-arch-only binNMUs.
   * Add alternative dependency on 32-bit libwine-dev to wine64-tools.
+  * Make wineNN-tools multi-arch installable (closes: #824673, see: #823264).
+    Thanks to Javier Serrano Polo.
 
  -- Jens Reyer <jre.winesim at gmail.com>  Sun, 05 Jun 2016 15:24:30 +0200
 
diff --git a/debian/control.in b/debian/control.in
index 310afbb..28563d8 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -165,11 +165,12 @@ Description: Windows API implementation - prelinked 64-bit binary loader
 
 Package: wine32VERSION-tools
 Architecture: any-i386 any-powerpc armel armhf
+Multi-Arch: foreign
 Section: libdevel
 Built-Using: ${built:Using}
 Depends:
- gcc,
- ${perl:Depends},
+ gcc | gcc-multilib:amd64 [i386],
+ ${perl:Depends} | perl:any [i386],
  ${misc:Depends},
  ${shlibs:Depends},
  libwineVERSION-dev (= ${binary:Version}),
@@ -183,6 +184,7 @@ Description: Windows API implementation - 32-bit developer tools
 
 Package: wine64VERSION-tools
 Architecture: amd64 arm64
+Multi-Arch: foreign
 Section: libdevel
 Built-Using: ${built:Using}
 Depends:

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