[pkg-wine-party] [wine] 02/06: Merge wineserver package into wine.

Jens Reyer jreyer-guest at moszumanska.debian.org
Fri Jan 8 04:24:52 UTC 2016


This is an automated email from the git hooks/post-receive script.

jreyer-guest pushed a commit to branch master
in repository wine.

commit 0d0dbc6c1ff36def80349c4e192b43e32288533d
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Fri Jan 8 04:39:31 2016 +0100

    Merge wineserver package into wine.
    
    Drop separate package wineserver.
    
    Install the wineserver binary as
    /usr/lib/wineVERSION/wineserverBITS only.
    Change wineserver script to default to wineserver64, and
    fall back to wineserver32.
---
 debian/control.in                 | 22 ++--------------------
 debian/libwineVERSION.install     |  1 -
 debian/rules                      |  7 ++-----
 debian/scripts/wineserver         | 20 ++++++++++++++++++--
 debian/wine32VERSION.install      |  1 +
 debian/wine64VERSION.install      |  1 +
 debian/wineVERSION.install        |  1 +
 debian/wineVERSION.manpages       |  1 +
 debian/wineserverVERSION.docs     |  1 -
 debian/wineserverVERSION.install  |  1 -
 debian/wineserverVERSION.manpages |  1 -
 11 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index ec8b92e..021830e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -81,24 +81,8 @@ 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}
-Depends:
- ${misc:Depends},
- ${shlibs:Depends},
- libwineVERSION (= ${binary:Version}),
-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.
+ This package provides essential wrappers and convenience tools for the
+ standard Wine components.
 
 Package: wineVERSION-binfmt
 Architecture: all
@@ -122,7 +106,6 @@ Depends:
  ${shlibs:Depends},
  x11-utils,
  libwineVERSION (= ${binary:Version}),
- wineserverVERSION:any (= ${binary:Version}),
 Recommends:
  wineVERSION (= ${source:Version}),
  libgl1-mesa-dri,
@@ -148,7 +131,6 @@ 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 a916720..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.real
 debian/tmp/usr/lib/*/*/libwine.so.*
 
 debian/tmp/usr/share/*/wine/*.*
diff --git a/debian/rules b/debian/rules
index 32c8040e..348acbc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,9 +65,6 @@ 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 < $< > $@
 
@@ -112,8 +109,8 @@ 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
-	sed 's|LIBDIR|$(LIBDIR)|g' < debian/scripts/wineserver > debian/tmp/wineserver$(VERSION)
+	cp debian/tmp/$(LIBDIR)/wineserver debian/tmp/$(LIBDIR)/wineserver$(DEB_BUILD_ARCH_BITS)
+	cp 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 fda32f1..d6c97a8 100755
--- a/debian/scripts/wineserver
+++ b/debian/scripts/wineserver
@@ -1,2 +1,18 @@
-#!/bin/sh
-/LIBDIR/wineserver.real -p0 "$@"
+#!/bin/sh -e
+
+name="$(basename $0|sed s/server//)"
+bindir=/usr/lib/$name
+
+wineserver32=$bindir/wineserver32
+wineserver64=$bindir/wineserver64
+
+if test -x "$wineserver64"; then
+    wineserver=$wineserver64
+elif test -x "$wineserver32"; then
+    wineserver=$wineserver32
+else
+    echo "error: unable to find wineserver executable.  this shouldn't happen."
+    exit 1
+fi
+
+$wineserver -p0 "$@"
diff --git a/debian/wine32VERSION.install b/debian/wine32VERSION.install
index 0a32c47..8a0dabc 100644
--- a/debian/wine32VERSION.install
+++ b/debian/wine32VERSION.install
@@ -1 +1,2 @@
 usr/lib/*/*/wine usr/lib/wineVERSION
+usr/lib/*/*/wineserver32 usr/lib/wineVERSION
diff --git a/debian/wine64VERSION.install b/debian/wine64VERSION.install
index 7b83d9d..2393e6c 100644
--- a/debian/wine64VERSION.install
+++ b/debian/wine64VERSION.install
@@ -1 +1,2 @@
 usr/lib/*/*/wine64 usr/lib/wineVERSION
+usr/lib/*/*/wineserver64 usr/lib/wineVERSION
diff --git a/debian/wineVERSION.install b/debian/wineVERSION.install
index c27eb19..750fc5e 100644
--- a/debian/wineVERSION.install
+++ b/debian/wineVERSION.install
@@ -1,2 +1,3 @@
 debian/tmp/wineVERSION usr/bin
+debian/tmp/wineserverVERSION usr/bin
 debian/tmp/wineapploader usr/lib/wineVERSION
diff --git a/debian/wineVERSION.manpages b/debian/wineVERSION.manpages
index ca54838..1b023fe 100644
--- a/debian/wineVERSION.manpages
+++ b/debian/wineVERSION.manpages
@@ -1,4 +1,5 @@
 debian/tmp/usr/share/man/man1/wineVERSION.1
+debian/tmp/usr/share/man/man1/wineserverVERSION.1
 
 debian/tmp/usr/share/man/man1/msiexecVERSION.1
 debian/tmp/usr/share/man/man1/winecfgVERSION.1
diff --git a/debian/wineserverVERSION.docs b/debian/wineserverVERSION.docs
deleted file mode 100644
index 3470255..0000000
--- a/debian/wineserverVERSION.docs
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/changelog
diff --git a/debian/wineserverVERSION.install b/debian/wineserverVERSION.install
deleted file mode 100644
index 25d130a..0000000
--- a/debian/wineserverVERSION.install
+++ /dev/null
@@ -1 +0,0 @@
-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



More information about the pkg-wine-party mailing list