[pkg-wine-party] [wine] 105/114: 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 stretch
in repository wine.

commit 09f79bd2bba6917e6bf09dc14d1744495ca6c570
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.
    
    # Conflicts:
    #	debian/changelog
---
 debian/changelog  | 2 ++
 debian/control.in | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7831230..2177894 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ wine (1.8.2-2) UNRELEASED; urgency=medium
       upon libraries. Thanks to Jakub Wilk.
     - 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: #823264,
+      see: #824673). Thanks to 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 8cc9fcd..60a6610 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -173,11 +173,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}),
@@ -191,6 +192,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