[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.10-1-583-gad432bf
The following commit has been merged in the master branch:
commit 9871b5e3a63189a461bcbae2e31364da2f6e9761
Author: Ove Kaaven <ovek@arcticnet.no>
Date: Wed Jan 7 17:38:53 2009 +0100
Try to install wine-kthread, wine-pthread, and wine-preloader only if they were built
(basically only on i386 systems with glibc). Closes: #511077.
diff --git a/debian/libwine.install b/debian/libwine.install
index b89bca9..3bb7f28 100644
--- a/debian/libwine.install
+++ b/debian/libwine.install
@@ -12,9 +12,6 @@ debian/tmp/usr/lib/wine/*.drv16
debian/tmp/usr/lib/wine/*.exe16
debian/tmp/usr/lib/wine/*.mod16
debian/tmp/usr/lib/wine/wine.bin
-debian/tmp/usr/lib/wine/wine-kthread
-debian/tmp/usr/lib/wine/wine-pthread
-debian/tmp/usr/lib/wine/wine-preloader
debian/tmp/usr/lib/wine/wineserver
debian/tmp/usr/share/wine/generic.ppd
debian/tmp/usr/share/wine/fonts
diff --git a/debian/rules b/debian/rules
index 618164f..3cfc4a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,6 +65,8 @@ BUILDS = build32
NATIVE_BUILD = build32
endif
+LOADERS = wine-kthread wine-pthread wine-preloader
+
configure-ia32: configure-ia32-stamp
configure-ia32-stamp:
dh_testdir
@@ -197,9 +199,10 @@ install-arch32-stamp: build-arch32-stamp
$(MAKE) -C build32 install prefix=`pwd`/debian/tmp/usr libdir=`pwd`/debian/tmp/usr/lib
# move the real binaries into /usr/lib/wine
mv debian/tmp/usr/bin/wine debian/tmp/usr/lib/wine/wine.bin
- mv debian/tmp/usr/bin/wine-kthread debian/tmp/usr/lib/wine/wine-kthread
- mv debian/tmp/usr/bin/wine-pthread debian/tmp/usr/lib/wine/wine-pthread
- mv debian/tmp/usr/bin/wine-preloader debian/tmp/usr/lib/wine/wine-preloader
+ for ldr in $(LOADERS); do \
+ [ ! -f debian/tmp/usr/bin/$$ldr ] || \
+ mv debian/tmp/usr/bin/$$ldr debian/tmp/usr/lib/wine; \
+ done
mv debian/tmp/usr/bin/wineserver debian/tmp/usr/lib/wine/wineserver
# install manpages
$(MAKE) -C build32/documentation install-man prefix=`pwd`/debian/tmp/usr
@@ -281,6 +284,12 @@ ifeq (,$(AMD64_COPY))
# distribute files into debian/<packagename>
# according to the <packagename>.install files
dh_install -s --list-missing
+ # certain binaries are only compiled on some platforms;
+ # if they were compiled on the current one, install them
+ for ldr in $(LOADERS); do \
+ [ ! -f debian/tmp/usr/lib/wine/$$ldr ] || \
+ mv debian/tmp/usr/lib/wine/$$ldr debian/libwine/usr/lib/wine; \
+ done
# patch marlett.ttf due to fontforge bug #458234
#mensis -script debian/marlett.mensis debian/libwine/usr/share/wine/fonts/marlett.ttf
--
Debian Wine packaging
Reply to: