[pkg-wine-party] [wine] 09/12: Let libwine-dev prefer wine64-tools to wine32-tools.

[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 4b5983772f8ecc8bf93c5da27f39e6d138ca4ab5
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Sun Jun 5 16:21:58 2016 +0200

    Let libwine-dev prefer wine64-tools to wine32-tools.
    
    Otherwise, if libwine-dev is installed from a 32-bit and a 64-bit
    arch, the recommends may be resolved to wine32-tools and
    wine64-tools (which conflict with each other).
    
    This also prevents issues on arm64 with 32-bit libwine-dev
    installed while wine32-tools is not installable because of its
    dependencies there.
---
 debian/changelog  | 1 +
 debian/control.in | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index dec2fcb..93b6c95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ wine-development (1.9.11-2) UNRELEASED; urgency=medium
   * 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.
+  * Let libwine-dev prefer wine64-tools to wine32-tools.
 
  -- 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 28563d8..8778ce4 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -243,7 +243,7 @@ Depends:
  libwineVERSION (= ${binary:Version}),
  libc6-dev,
 Recommends:
- wine32VERSION-tools (= ${binary:Version}) | wine64VERSION-tools (= ${binary:Version}),
+ wine64VERSION-tools (= ${binary:Version}) | wine32VERSION-tools (= ${binary:Version}),
 Breaks:
  wine32VERSION (<< 1.7.51-2~),
  wine64VERSION (<< 1.7.51-2~),

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