[pkg-wine-party] [wine] 01/10: Install only one wineserver and call it from /usr/bin/wineserver.

[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 7232ad5bf8e9c89df3a8045aea8a94c4225c71c2
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Sat Jan 2 21:19:53 2016 +0100

    Install only one wineserver and call it from /usr/bin/wineserver.
    
    The new package wineserver is multi-arch:allowed, because wine32
    may use a foreign 64-bit wineserver, while wine64 requires the
    native version. Per default the native version will be installed,
    but it's also possible to install a pure 32-bit Wine from i386 on
    amd64.
    
    Break/Replace older libwine that shipped the wineserver.
---
 debian/control.in                | 23 +++++++++++++++++++++++
 debian/libwineVERSION.install    |  1 -
 debian/rules                     |  6 ++++--
 debian/scripts/wineserver        |  2 +-
 debian/wineserverVERSION.install |  2 ++
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index 8cfcf33..cc71423 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -83,6 +83,27 @@ Description: Windows API implementation - standard suite
  .
  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}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ libwineVERSION (= ${binary:Version}),
+Breaks:
+ libwineVERSION (<< 1.8-2~),
+Replaces:
+ libwineVERSION (<< 1.8-2~),
+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 (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
 Depends:
@@ -105,6 +126,7 @@ Depends:
  ${shlibs:Depends},
  x11-utils,
  libwineVERSION (= ${binary:Version}),
+ wineserverVERSION:any (= ${binary:Version}),
 Recommends:
  wineVERSION (= ${source:Version}),
  libgl1-mesa-dri,
@@ -130,6 +152,7 @@ Depends:
  ${shlibs:Depends},
  x11-utils,
  libwineVERSION (= ${binary:Version}),
+ wineserverVERSION (= ${binary:Version}),
 Recommends:
  wineVERSION (= ${source:Version}),
  wine32VERSION (>= ${source:Version}),
diff --git a/debian/libwineVERSION.install b/debian/libwineVERSION.install
index 674e059..e1785f6 100644
--- a/debian/libwineVERSION.install
+++ b/debian/libwineVERSION.install
@@ -1,6 +1,5 @@
 debian/tmp/usr/lib/*/*/*.*.so
 debian/tmp/usr/lib/*/*/fakedlls
-debian/tmp/usr/lib/*/*/wineserver*
 debian/tmp/usr/lib/*/*/libwine.so.*
 
 debian/tmp/usr/share/*/wine/*.*
diff --git a/debian/rules b/debian/rules
index 4f12d9e..1dba5a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,6 +65,9 @@ debian/control: debian/control.in
 debian/wine$(VERSION)%: debian/wineVERSION%
 	sed s/VERSION/$(VERSION)/g < $< > $@
 
+debian/wineserver$(VERSION)%: debian/wineserverVERSION%
+	sed s/VERSION/$(VERSION)/g < $< > $@
+
 debian/wine32$(VERSION)%: debian/wine32VERSION%
 	sed s/VERSION/$(VERSION)/g < $< > $@
 
@@ -109,8 +112,7 @@ override_dh_install: $(INSTALLS)
 	cp tools/winedump/README debian/tmp/README.winedump
 	cp programs/winedbg/README debian/tmp/README.winedbg
 	cp debian/tmp/$(LIBDIR)/winecfg debian/tmp/wineapploader
-	cp debian/tmp/$(LIBDIR)/wineserver debian/tmp/$(LIBDIR)/wineserver.real
-	cp debian/scripts/wineserver debian/tmp/$(LIBDIR)
+	sed 's|LIBDIR|$(LIBDIR)|g' < debian/scripts/wineserver > debian/tmp/wineserver$(VERSION)
 	test -f debian/tmp/$(LIBDIR)/wine-preloader || \
 	    cp debian/scripts/wine-preloader debian/tmp/$(LIBDIR)
 	for file in $$(find debian/tmp/$(MANDIR) -type f); do \
diff --git a/debian/scripts/wineserver b/debian/scripts/wineserver
index 8adec3e..b1b3406 100755
--- a/debian/scripts/wineserver
+++ b/debian/scripts/wineserver
@@ -1,2 +1,2 @@
 #!/bin/sh
-$(dirname $0)/wineserver.real -p0 "$@"
+/LIBDIR/wineserver -p0 "$@"
diff --git a/debian/wineserverVERSION.install b/debian/wineserverVERSION.install
new file mode 100644
index 0000000..668e9b6
--- /dev/null
+++ b/debian/wineserverVERSION.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/*/*/wineserver
+debian/tmp/wineserverVERSION usr/bin

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