[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.12-1-4-g9bfe0f9

[Ove Kaaven]

The following commit has been merged in the master branch:
commit 1b309bdc677cd192fd4c8aca63731aa4f7aa2316
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Mon Jan 12 21:20:27 2009 +0100

    Added a more general way to only install certain binaries into libwine if they were actually built;
    it now also works for wine-bin, where winevdm.exe.so is now in the list of optional binaries.

diff --git a/debian/libwine.install b/debian/libwine.install-common
similarity index 100%
rename from debian/libwine.install
rename to debian/libwine.install-common
diff --git a/debian/libwine.install-platform b/debian/libwine.install-platform
new file mode 100644
index 0000000..7f7eeb6
--- /dev/null
+++ b/debian/libwine.install-platform
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/wine/wine-kthread
+debian/tmp/usr/lib/wine/wine-pthread
+debian/tmp/usr/lib/wine/wine-preloader
diff --git a/debian/rules b/debian/rules
index 6168e85..6f48649 100755
--- a/debian/rules
+++ b/debian/rules
@@ -178,6 +178,7 @@ endif
 clean: clean-arch32 clean-arch64
 	dh_testdir
 	dh_testroot
+	rm -f debian/libwine.install debian/wine-bin.install
 	rm -f install-arch-stamp build-indep-stamp configure-ia32-stamp
 ifeq (false,$(AMD64_PACK))
 	rm -f debian/amd64.tar.lzma.uu
@@ -281,16 +282,20 @@ binary-arch: install-arch-stamp
 	dh_installdirs -s
 
 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 ] || \
-	 install debian/tmp/usr/lib/wine/$$ldr debian/libwine/usr/lib/wine; \
+	for pkg in libwine wine-bin; do \
+	 cp debian/$$pkg.install-common debian/$$pkg.install; \
+	 for bin in $$(cat debian/$$pkg.install-platform); do \
+	  [ ! -f $$bin ] || \
+	  echo $$bin >> debian/$$pkg.install; \
+	 done; \
 	done
 
+	# distribute files into debian/<packagename>
+	# according to the <packagename>.install files
+	dh_install -s --list-missing
+
 	# patch marlett.ttf due to fontforge bug #458234
 	#mensis -script debian/marlett.mensis debian/libwine/usr/share/wine/fonts/marlett.ttf
 	#rm -f debian/libwine/usr/share/wine/fonts/marlett.ttf~
diff --git a/debian/wine-bin.install b/debian/wine-bin.install-common
similarity index 97%
rename from debian/wine-bin.install
rename to debian/wine-bin.install-common
index 1e2cf80..a4b3504 100644
--- a/debian/wine-bin.install
+++ b/debian/wine-bin.install-common
@@ -35,7 +35,6 @@ debian/tmp/usr/lib/wine/wineconsole.exe.so
 debian/tmp/usr/lib/wine/winedevice.exe.so
 debian/tmp/usr/lib/wine/winemenubuilder.exe.so
 debian/tmp/usr/lib/wine/winepath.exe.so
-debian/tmp/usr/lib/wine/winevdm.exe.so
 debian/tmp/usr/lib/wine/winhlp32.exe.so
 debian/tmp/usr/lib/wine/write.exe.so
 debian/tmp/usr/lib/wine/xcopy.exe.so
diff --git a/debian/wine-bin.install-platform b/debian/wine-bin.install-platform
new file mode 100644
index 0000000..df29483
--- /dev/null
+++ b/debian/wine-bin.install-platform
@@ -0,0 +1 @@
+debian/tmp/usr/lib/wine/winevdm.exe.so

-- 
Debian Wine packaging