[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.31-1-559-g0a49f78
The following commit has been merged in the master branch:
commit c1d68780d97ee2f2d56fcc5eb6d4c750f6800d1b
Author: Ove Kaaven <ovek@arcticnet.no>
Date: Sat Oct 31 02:56:23 2009 +0100
The suffix given to the package names is now also given to libwine.so.
(This is intended as a step towards making libwine and libwine-unstable coinstallable.)
diff --git a/debian/rules b/debian/rules
index 83d15b1..ab50c39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -183,11 +183,11 @@ build-arch32-stamp: configure-arch32-stamp
dh_testdir
ifeq (,$(DEB_SAVEBUILD))
- $(MAKE) -C build32 depend
+ $(MAKE) -C build32 LIBSUFFIX="$(VERSUFFIX)" depend
# build wine & tools
- $(MAKE) -C build32 $(BUILDOPTS)
+ $(MAKE) -C build32 LIBSUFFIX="$(VERSUFFIX)" $(BUILDOPTS)
# build winelib programs
- $(MAKE) -C build32/programs
+ $(MAKE) -C build32/programs LIBSUFFIX="$(VERSUFFIX)"
endif
touch build-arch32-stamp
@@ -197,11 +197,11 @@ build-arch64-stamp: configure-arch64-stamp
dh_testdir
ifeq (,$(DEB_SAVEBUILD))
- $(MAKE) -C build64 depend
+ $(MAKE) -C build64 LIBSUFFIX="$(VERSUFFIX)" depend
# build wine & tools
- $(MAKE) -C build64 $(BUILDOPTS)
+ $(MAKE) -C build64 LIBSUFFIX="$(VERSUFFIX)" $(BUILDOPTS)
# build winelib programs
- $(MAKE) -C build64/programs
+ $(MAKE) -C build64/programs LIBSUFFIX="$(VERSUFFIX)"
endif
touch build-arch64-stamp
@@ -249,7 +249,7 @@ install-arch32-stamp: build-arch32-stamp
dh_testroot
# install wine, libwine, fonts, and tools
- $(MAKE) -C build32 install DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) -C build32 install LIBSUFFIX="$(VERSUFFIX)" DESTDIR=$(CURDIR)/debian/tmp
# move the real binaries into /$(IA32_LIBDIR)/wine
mv debian/tmp/usr/bin/wine debian/tmp/$(IA32_LIBDIR)/wine/wine.bin
for ldr in $(LOADERS); do \
@@ -261,7 +261,7 @@ install-arch32-stamp: build-arch32-stamp
$(MAKE) -C build32/documentation install-man DESTDIR=$(CURDIR)/debian/tmp
mv debian/tmp/usr/share/man/man3w debian/tmp/usr/share/man/man3
# install winelib programs
- $(MAKE) -C build32/programs install DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) -C build32/programs install LIBSUFFIX="$(VERSUFFIX)" DESTDIR=$(CURDIR)/debian/tmp
install build32/tools/fnt2bdf debian/tmp/usr/bin
rm -f debian/tmp/usr/bin/winelauncher
sed "s,usr/lib/wine,$(IA32_LIBDIR)/wine," debian/winelauncher > debian/tmp/usr/bin/wine
@@ -276,7 +276,7 @@ install-arch64-stamp: build-arch64-stamp $(patsubst build%,install-arch%-stamp,$
dh_testroot
# install wine, libwine, fonts, and tools
- $(MAKE) -C build64 install DESTDIR=$(CURDIR)/debian/tmp/usr
+ $(MAKE) -C build64 install LIBSUFFIX="$(VERSUFFIX)" DESTDIR=$(CURDIR)/debian/tmp/usr
# move the real binaries into /$(AMD64_LIBDIR)/wine
mv debian/tmp/usr/bin/wine debian/tmp/$(AMD64_LIBDIR)/wine/wine.bin
mv debian/tmp/usr/bin/wineserver debian/tmp/$(AMD64_LIBDIR)/wine/wineserver
@@ -284,7 +284,7 @@ install-arch64-stamp: build-arch64-stamp $(patsubst build%,install-arch%-stamp,$
$(MAKE) -C build64/documentation install-man DESTDIR=$(CURDIR)/debian/tmp
mv debian/tmp/usr/share/man/man3w debian/tmp/usr/share/man/man3
# install winelib programs
- $(MAKE) -C build64/programs install DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) -C build64/programs install LIBSUFFIX="$(VERSUFFIX)" DESTDIR=$(CURDIR)/debian/tmp
install build64/tools/fnt2bdf debian/tmp/usr/bin
rm -f debian/tmp/usr/bin/winelauncher
sed "s,usr/lib/wine,$(AMD64_LIBDIR)/wine," debian/winelauncher > debian/tmp/usr/bin/wine
--
Debian Wine packaging
Reply to: