[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.19-1-319-ge761c3c

[Ove Kaaven]

The following commit has been merged in the master branch:
commit 089c17840b89117256bc16e6872e220e7877acd7
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Mon Jun 1 00:18:26 2009 +0200

    On amd64, winelib is now installed into /usr/lib32 instead of /usr/lib.
    (This *is* an upload to experimental, after all...)

diff --git a/debian/prep-install.sh b/debian/prep-install.sh
index 269fa18..b188939 100644
--- a/debian/prep-install.sh
+++ b/debian/prep-install.sh
@@ -1,12 +1,40 @@
 #!/bin/bash
-for inst in debian/*.install-common; do
-  package="$(basename "$inst" .install-common)"
-  cp debian/$package.install-common debian/$package.install
-  # certain binaries are only compiled on some platforms;
-  # if they were compiled on the current one, install them
-  for bin in $(cat debian/$package.install-platform); do
+LIBDIRS="$1"
+
+function expand_common
+{
+  sed "s,/usr/lib,/usr/$1," debian/$package.install-common > debian/$package.install
+  shift
+  while [ -n "$1" ]; do
+    sed -n "s,/usr/lib,/usr/$1,p" debian/$package.install-common >> debian/$package.install
+    shift
+  done
+}
+
+# certain binaries are only compiled on some platforms;
+# if they were compiled on the current one, install them
+function expand_platform
+{
+  if [ ! -f debian/$package.install-platform ]; then
+    return
+  fi
+  for bin in $(sed "s,/usr/lib,/usr/$1," debian/$package.install-platform); do
     [ ! -f $bin ] || echo $bin >> debian/$package.install
   done
+  shift
+  while [ -n "$1" ]; do
+    for bin in $(sed -n "s,/usr/lib,/usr/$1,p" debian/$package.install-platform); do
+      [ ! -f $bin ] || echo $bin >> debian/$package.install
+    done
+    shift
+  done
+}
+
+for inst in debian/*.install-common; do
+  package="$(basename "$inst" .install-common)"
+  expand_common $LIBDIRS
+  expand_platform $LIBDIRS
 done
+
 # return success
 true
diff --git a/debian/rules b/debian/rules
index 1d6a0ca..3e81d7f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,7 @@ VERSION := $(lastword $(shell dpkg-parsechangelog|grep "^Version: "))
 
 CC=gcc
 LIBDIR=lib
+LIBDIRS=$(LIBDIR)
 
 IA32_CC := $(CC)
 IA32_CFLAGS := $(CFLAGS)
@@ -45,11 +46,13 @@ ifeq ($(DEB_HOST_GNU_CPU),x86_64)
 
 IA32_LIBS = /emul/ia32-linux
 IA32_LDFLAGS += -L$(CURDIR)/lib32
-#IA32_LIBDIR = lib32
+IA32_LIBDIR = lib32
 
 # Not ready yet: build Win64 version
 #BUILDS = build32 build64
+#LIBDIRS = $(IA32_LIBDIR) $(AMD64_LIBDIR)
 BUILDS = build32
+LIBDIRS = $(IA32_LIBDIR)
 
 else # !x86_64
 
@@ -203,6 +206,7 @@ install-arch32-stamp: build-arch32-stamp
 	$(MAKE) -C build32/programs install prefix=`pwd`/debian/tmp/usr
 	install build32/tools/fnt2bdf debian/tmp/usr/bin
 	rm -f debian/tmp/usr/bin/winelauncher
+	sed "s,usr/lib/wine,usr/$(IA32_LIBDIR)/wine," debian/winelauncher > debian/tmp/usr/bin/wine
 
 	touch install-arch32-stamp
 
@@ -225,6 +229,7 @@ install-arch64-stamp: build-arch64-stamp
 	$(MAKE) -C build64/programs install prefix=`pwd`/debian/tmp/usr
 	install build64/tools/fnt2bdf debian/tmp/usr/bin
 	rm -f debian/tmp/usr/bin/winelauncher
+	sed "s,usr/lib/wine,usr/$(AMD64_LIBDIR)/wine," debian/winelauncher > debian/tmp/usr/bin/wine
 
 	touch install-arch64-stamp
 
@@ -233,8 +238,6 @@ install-arch-stamp: $(patsubst build%,install-arch%-stamp,$(BUILDS))
 	dh_testdir
 	dh_testroot
 
-	mkdir -p debian/tmp/usr/bin
-	install -m 755 debian/winelauncher debian/tmp/usr/bin/wine
 	# MIME and binfmt databases
 	mkdir -p debian/tmp/usr/share/{mime-info,binfmts}
 	cp debian/mime-info.mime	debian/tmp/usr/share/mime-info/wine.mime
@@ -275,7 +278,7 @@ binary-arch: install-arch-stamp
 	bash debian/doclink.sh libwine
 
 	# prepare <packagename>.install files
-	bash debian/prep-install.sh
+	bash debian/prep-install.sh "$(LIBDIRS)"
 
 	# distribute files into debian/<packagename>
 	# according to the <packagename>.install files
@@ -286,7 +289,7 @@ binary-arch: install-arch-stamp
 	#rm -f debian/libwine/usr/share/wine/fonts/marlett.ttf~
 
 	# split up libwine
-	bash debian/split.sh libwine usr/lib/wine
+	bash debian/split.sh libwine $(patsubst %,usr/%/wine,$(LIBDIRS))
 
 	dh_installdocs -plibwine
 	dh_installchangelogs -plibwine
diff --git a/debian/split.sh b/debian/split.sh
index 2891d1f..dc6f47e 100644
--- a/debian/split.sh
+++ b/debian/split.sh
@@ -1,13 +1,17 @@
 #!/bin/bash
 SRC="$1"
-PREFIX="$2"
-while read DEST NAME; do
-  for bin in debian/$SRC/$PREFIX/$NAME; do
-    if [ -f $bin ]; then
-      install -d debian/$DEST/$PREFIX
-      mv $bin debian/$DEST/$PREFIX
-    fi
-  done
-done < debian/$SRC.split
+shift
+while [ -n "$1" ]; do
+  PREFIX="$1"
+  while read DEST NAME; do
+    for bin in debian/$SRC/$PREFIX/$NAME; do
+      if [ -f $bin ]; then
+        install -d debian/$DEST/$PREFIX
+        mv $bin debian/$DEST/$PREFIX
+      fi
+    done
+  done < debian/$SRC.split
+  shift
+done
 # return success
 true

-- 
Debian Wine packaging