This is an automated email from the git hooks/post-receive script. jreyer-guest pushed a commit to branch master in repository wine.
commit 74dca0677c2f1641feb80101b4ac36299b1cbf56 Author: Jens Reyer <[email protected]> Date: Sat Jan 2 15:58:06 2016 +0100 Merge package wineserver into wine. Make wine multi-arch:allowed. As sideeffect this simplifies the versioned dependencies. wine32|64 need to depend on wine now. Downgrade wine's dependency on wine32|64 to recommends, to avoid a circular dependency. Move the dependency on gecko to wine. --- debian/control.in | 43 +++++++--------------- debian/wineVERSION.install | 2 + ...ian-overrides => wineVERSION.lintian-overrides} | 0 debian/wineVERSION.manpages | 2 + debian/wineserverVERSION.install | 2 - debian/wineserverVERSION.manpages | 1 - 6 files changed, 17 insertions(+), 33 deletions(-) diff --git a/debian/control.in b/debian/control.in index 85f9578..3520355 100644 --- a/debian/control.in +++ b/debian/control.in @@ -67,23 +67,6 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-wine/wine.git Vcs-Git: git://anonscm.debian.org/pkg-wine/wine.git Package: wineVERSION -Architecture: all -Multi-Arch: foreign -Built-Using: ${built:Using} -Depends: - ${misc:Depends}, - wine64VERSION (>= ${source:Version}) | wine32VERSION (>= ${source:Version}), - wine64VERSION (<< ${source:Version}.1~) | wine32VERSION (<< ${source:Version}.1~), -Suggests: - wineVERSION-binfmt, - dosbox (>= 0.74-4.2~), -Description: Windows API implementation - standard suite - Wine is a free MS-Windows API implementation. - This is still a work in progress and many applications may still not work. - . - This package provides convenience tools for the standard Wine components. - -Package: wineserverVERSION Architecture: amd64 any-i386 any-powerpc armel armhf arm64 Multi-Arch: allowed Built-Using: ${built:Using} @@ -91,18 +74,23 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libwineVERSION (= ${binary:Version}), +Recommends: + wine32VERSION (= ${binary:Version}), + wine64VERSION (= ${binary:Version}), + libwine-gecko-2.40 [!armel !armhf !arm64], +Suggests: + wineVERSION-binfmt, + dosbox (>= 0.74-4.2~), Breaks: libwineVERSION (<< 1.8-2~), Replaces: libwineVERSION (<< 1.8-2~), -Description: Windows API implementation - server +Description: Windows API implementation - standard suite Wine is a free MS-Windows API implementation. This is still a work in progress and many applications may still not work. . - This package provides the wineserver (a daemon process that provides to - Wine roughly the same services that the Windows kernel provides on - Windows). The 64-bit version may be used by 32-bit and 64-bit binary - loaders. + This package provides the wineserver and convenience tools for the standard + Wine components. Package: wineVERSION-binfmt Architecture: all @@ -125,12 +113,10 @@ Depends: ${dlopen:Depends}, ${shlibs:Depends}, x11-utils, + wineVERSION:any (= ${binary:Version}), libwineVERSION (= ${binary:Version}), - wineserverVERSION:any (= ${binary:Version}), Recommends: - wineVERSION (= ${source:Version}), libgl1-mesa-dri, - libwine-gecko-2.40 [!armel !armhf !arm64], libasound2-plugins, Suggests: wine32VERSION-preloader (= ${binary:Version}), @@ -153,13 +139,10 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, x11-utils, + wineVERSION (= ${binary:Version}), libwineVERSION (= ${binary:Version}), - wineserverVERSION (= ${binary:Version}), Recommends: - wineVERSION (= ${source:Version}), - wine32VERSION (>= ${source:Version}), - wine32VERSION (<< ${source:Version}.1~), - libwine-gecko-2.40 [!armel !armhf !arm64], + wine32VERSION (= ${binary:Version}), libasound2-plugins, Suggests: wine64VERSION-preloader (= ${binary:Version}), diff --git a/debian/wineVERSION.install b/debian/wineVERSION.install index 253c49a..27bfe50 100644 --- a/debian/wineVERSION.install +++ b/debian/wineVERSION.install @@ -1 +1,3 @@ debian/tmp/wineapploader usr/lib/wineVERSION +debian/tmp/wineserverVERSION usr/bin +debian/tmp/usr/lib/*/*/wineserver diff --git a/debian/wineserverVERSION.lintian-overrides b/debian/wineVERSION.lintian-overrides similarity index 100% rename from debian/wineserverVERSION.lintian-overrides rename to debian/wineVERSION.lintian-overrides diff --git a/debian/wineVERSION.manpages b/debian/wineVERSION.manpages index e98b616..425a969 100644 --- a/debian/wineVERSION.manpages +++ b/debian/wineVERSION.manpages @@ -1,3 +1,5 @@ +debian/tmp/usr/share/man/man1/wineserverVERSION.1 + debian/tmp/usr/share/man/man1/msiexecVERSION.1 debian/tmp/usr/share/man/man1/winecfgVERSION.1 debian/tmp/usr/share/man/man1/winedbgVERSION.1 diff --git a/debian/wineserverVERSION.install b/debian/wineserverVERSION.install deleted file mode 100644 index 668e9b6..0000000 --- a/debian/wineserverVERSION.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/*/*/wineserver -debian/tmp/wineserverVERSION usr/bin diff --git a/debian/wineserverVERSION.manpages b/debian/wineserverVERSION.manpages deleted file mode 100644 index 18f6275..0000000 --- a/debian/wineserverVERSION.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/share/man/man1/wineserverVERSION.1 -- 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
