[pkg-wine-party] [wine] 60/114: Move some dependencies to libwineVERSION.

[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 7405e84e7a9bfcd73ef501eb1c036425bedde2ed
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Mon Jun 6 03:39:25 2016 +0200

    Move some dependencies to libwineVERSION.
    
    Both wine32VERSION and wine64VERSION depend on libwineVERSION
    from their arch each. Use this to deduplicate dependencies in
    d/control.in (x11-utils and libasound2-plugins), while making
    sure that the dependency exists on every bitness arch
    (${dlopen:Depends} and libgl1-mesa-dri).
    
    # Conflicts:
    #	debian/changelog
---
 debian/changelog  |  1 +
 debian/control.in | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8f36151..e7bdee9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ wine (1.8.2-2) UNRELEASED; urgency=medium
     - Fix local search for addon (gecko/mono) installers and update
       documentation for their manual installation (closes: #812750).
     - Bump recommended fonts-wine version to one with ttf fonts.
+    - Move some dependencies to libwineVERSION.
 
  -- 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 03e6e44..cf2dea4 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -108,14 +108,10 @@ Multi-Arch: foreign
 Built-Using: ${built:Using}
 Depends:
  ${misc:Depends},
- ${dlopen:Depends},
  ${shlibs:Depends},
- x11-utils,
  libwineVERSION (= ${binary:Version}),
 Recommends:
  wineVERSION (= ${source:Version}),
- libgl1-mesa-dri,
- libasound2-plugins,
 Suggests:
  wine32VERSION-preloader (= ${binary:Version}),
 Breaks:
@@ -134,13 +130,11 @@ Built-Using: ${built:Using}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
- x11-utils,
  libwineVERSION (= ${binary:Version}),
 Recommends:
  wineVERSION (= ${source:Version}),
  wine32VERSION (>= ${source:Version}),
  wine32VERSION (<< ${source:Version}.1~),
- libasound2-plugins,
 Suggests:
  wine64VERSION-preloader (= ${binary:Version}),
 Breaks:
@@ -238,10 +232,14 @@ Multi-Arch: same
 Built-Using: ${built:Using}
 Depends:
  ${misc:Depends},
+ ${dlopen:Depends},
  ${shlibs:Depends},
+ x11-utils,
  libfontconfig1,
 Recommends:
  libxcursor1,
+ libgl1-mesa-dri,
+ libasound2-plugins,
  fonts-liberation,
  fonts-wine (>= 1.8.2-1~),
 Suggests:

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