[pkg-wine-party] [PATCH 3/8] No longer use alternatives.

[Hilko Bengen]

They are of little practical use, even if 32-bit and 64-bit system
tools for multiple parallel Wine (regular, -unstable, ...) are
available.

Make sure that prep-install still picks up binaries when alternatives
are disabled.
---
 debian/prep-install.sh |    2 +-
 debian/rules           |    4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)
 mode change 100644 => 100755 debian/prep-install.sh

diff --git a/debian/prep-install.sh b/debian/prep-install.sh
old mode 100644
new mode 100755
index 599d600..1b105f7
--- a/debian/prep-install.sh
+++ b/debian/prep-install.sh
@@ -70,7 +70,7 @@ function expand_alternatives
   for bin in $(cat debian/$package.${ext}-alternatives); do
     bin32=$(echo "$bin"|sed -n "s,\(.*/[^./]*\)\(\.[0-9]+\)\?,\132$SUFFIX\2,p")
     bin64=$(echo "$bin"|sed -n "s,\(.*/[^./]*\)\(\.[0-9]+\)\?,\164$SUFFIX\2,p")
-    for tbin in $bin32 $bin64; do
+    for tbin in $bin $bin32 $bin64; do
       [ ! -f "$tbin" ] || echo "$tbin" >> debian/$package$SUFFIX.${ext}
     done
   done
diff --git a/debian/rules b/debian/rules
index 7feec4e..98369d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -256,8 +256,6 @@ install-arch32-stamp: build-arch32-stamp
 	# install tools
 	cp tools/font_convert.sh debian/tmp/usr/bin/wine-font-convert
 
-	bash debian/gen-alternatives.sh "$(VERSUFFIX)" 32 $(ALTPRIO32)
-
 	touch install-arch32-stamp
 
 # If building both 32-bit and 64-bit into the same packages, this will overwrite any 32-bit stuff
@@ -278,8 +276,6 @@ install-arch64-stamp: build-arch64-stamp $(patsubst build%,install-arch%-stamp,$
 	# install tools
 	cp tools/font_convert.sh debian/tmp/usr/bin/wine-font-convert
 
-	bash debian/gen-alternatives.sh "$(VERSUFFIX)" 64 $(ALTPRIO64)
-
 	touch install-arch64-stamp
 
 install-arch: install-arch-stamp
-- 
1.7.10