This is an automated email from the git hooks/post-receive script. jreyer-guest pushed a commit to branch stretch in repository wine.
commit 1d54f2724953488c9418a406f924794c1816ec9f Author: Jens Reyer <[email protected]> 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. # Conflicts: # debian/changelog --- debian/changelog | 1 + debian/control.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2177894..dbfdcac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ wine (1.8.2-2) UNRELEASED; urgency=medium - 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. + - Let libwine-dev prefer wine64-tools to wine32-tools. -- Jens Reyer <[email protected]> Mon, 06 Jun 2016 03:35:43 +0200 diff --git a/debian/control.in b/debian/control.in index 60a6610..63a92a1 100644 --- a/debian/control.in +++ b/debian/control.in @@ -268,7 +268,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 _______________________________________________ pkg-wine-party mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-wine-party
