[pkg-wine-party] [wine] 03/08: Revert "Merge package wineserver into wine."

[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 7c8793c5195afd82b394aca1514d398e43c59dcb
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Sun Jan 3 02:07:26 2016 +0100

    Revert "Merge package wineserver into wine."
    
    This reverts commit 74dca0677c2f1641feb80101b4ac36299b1cbf56.
---
 debian/control.in                                  | 43 +++++++++++++++-------
 debian/wineVERSION.install                         |  2 -
 debian/wineVERSION.manpages                        |  2 -
 ...neVERSION.install => wineserverVERSION.install} |  3 +-
 ...errides => wineserverVERSION.lintian-overrides} |  0
 debian/wineserverVERSION.manpages                  |  1 +
 6 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index 3520355..85f9578 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -67,6 +67,23 @@ 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}
@@ -74,23 +91,18 @@ 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 - standard suite
+Description: Windows API implementation - server
  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 and convenience tools for the standard
- Wine components.
+ 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.
 
 Package: wineVERSION-binfmt
 Architecture: all
@@ -113,10 +125,12 @@ 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}),
@@ -139,10 +153,13 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
  x11-utils,
- wineVERSION (= ${binary:Version}),
  libwineVERSION (= ${binary:Version}),
+ wineserverVERSION (= ${binary:Version}),
 Recommends:
- wine32VERSION (= ${binary:Version}),
+ wineVERSION (= ${source:Version}),
+ wine32VERSION (>= ${source:Version}),
+ wine32VERSION (<< ${source:Version}.1~),
+ libwine-gecko-2.40 [!armel !armhf !arm64],
  libasound2-plugins,
 Suggests:
  wine64VERSION-preloader (= ${binary:Version}),
diff --git a/debian/wineVERSION.install b/debian/wineVERSION.install
index 27bfe50..253c49a 100644
--- a/debian/wineVERSION.install
+++ b/debian/wineVERSION.install
@@ -1,3 +1 @@
 debian/tmp/wineapploader usr/lib/wineVERSION
-debian/tmp/wineserverVERSION usr/bin
-debian/tmp/usr/lib/*/*/wineserver
diff --git a/debian/wineVERSION.manpages b/debian/wineVERSION.manpages
index 425a969..e98b616 100644
--- a/debian/wineVERSION.manpages
+++ b/debian/wineVERSION.manpages
@@ -1,5 +1,3 @@
-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/wineVERSION.install b/debian/wineserverVERSION.install
similarity index 61%
copy from debian/wineVERSION.install
copy to debian/wineserverVERSION.install
index 27bfe50..668e9b6 100644
--- a/debian/wineVERSION.install
+++ b/debian/wineserverVERSION.install
@@ -1,3 +1,2 @@
-debian/tmp/wineapploader usr/lib/wineVERSION
-debian/tmp/wineserverVERSION usr/bin
 debian/tmp/usr/lib/*/*/wineserver
+debian/tmp/wineserverVERSION usr/bin
diff --git a/debian/wineVERSION.lintian-overrides b/debian/wineserverVERSION.lintian-overrides
similarity index 100%
rename from debian/wineVERSION.lintian-overrides
rename to debian/wineserverVERSION.lintian-overrides
diff --git a/debian/wineserverVERSION.manpages b/debian/wineserverVERSION.manpages
new file mode 100644
index 0000000..18f6275
--- /dev/null
+++ b/debian/wineserverVERSION.manpages
@@ -0,0 +1 @@
+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