This is an automated email from the git hooks/post-receive script. jreyer-guest pushed a commit to branch master in repository wine.
commit 81fcb544149536a5f387627d71baaa8833ef3bba Author: Jens Reyer <[email protected]> Date: Fri May 13 16:07:18 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). --- debian/changelog | 1 + debian/control.in | 10 ++++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 150d2f8..c7e55ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ wine-development (1.9.9-1) UNRELEASED; urgency=medium documentation for their manual installation (closes: #783428). * Bump recommended fonts-wine version to one with ttf fonts (closes: #818925). + * Move some dependencies to libwineVERSION. -- Jens Reyer <[email protected]> Fri, 13 May 2016 15:36:46 +0200 diff --git a/debian/control.in b/debian/control.in index 3557f1c..b2efb44 100644 --- a/debian/control.in +++ b/debian/control.in @@ -94,14 +94,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: libwine-gecko-2.40 [!armel !armhf !arm64], wine32VERSION-preloader (= ${binary:Version}), @@ -121,13 +117,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: libwine-gecko-2.40 [!armel !armhf !arm64], wine64VERSION-preloader (= ${binary:Version}), @@ -209,10 +203,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 _______________________________________________ pkg-wine-party mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-wine-party
