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

[Hilko Bengen]

Make sure that prep-install.sh still picks up the binaries.

Alternatives are of little practical use for the wine packages. If
32-bit and 64-bit system tools for multiple parallel Wine
installations (regular, -unstable, ...) are available, they will
likely just cause confusion.
---
 debian/gen-alternatives.sh |   49 --------------------------------------------
 debian/prep-install.sh     |    2 +-
 debian/rules               |   14 -------------
 3 files changed, 1 insertion(+), 64 deletions(-)
 delete mode 100755 debian/gen-alternatives.sh

diff --git a/debian/gen-alternatives.sh b/debian/gen-alternatives.sh
deleted file mode 100755
index 1e63857..0000000
--- a/debian/gen-alternatives.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-VSUFFIX="$1"
-ARCH="$2"
-PRIORITY="$3"
-SUFFIX="$ARCH$VSUFFIX"
-
-set -e
-
-function generate_postinst
-{
-  echo "update-alternatives \\"
-  echo -n "  --install /usr/bin/wine wine /usr/bin/wine$SUFFIX $PRIORITY"
-  for bin in $(cat debian/wine-bin.install-alternatives); do
-    dname=$bin
-    sname=$(echo $dname|sed -n "s,\(.*/[^./]*\)\(\.[0-9]+\)\?,\1$SUFFIX\2,p")
-    mv debian/tmp/$dname debian/tmp/$sname
-
-    case "$dname" in
-      /usr/share/man/*)
-        name=$(echo $dname|sed -n "s,/usr/share/man/\([^/]*\)/man[0-9]/\(.*\),\2.\1.gz,p;t;s,/usr/share/man/man[0-9]/\(.*\),\1.gz,p")
-        dname="$dname.gz"
-        sname="$sname.gz"
-        ;;
-      *)
-        name=$(basename $dname)
-        ;;
-    esac
-    if [ "$name" != "wine" ]; then
-      echo " \\"
-      echo -n "  --slave $dname $name $sname"
-    fi
-  done
-  echo
-  echo
-}
-
-function generate_prerm
-{
-  echo 'if [ "$1" != "upgrade" ]; then'
-  echo "  update-alternatives --remove wine /usr/bin/wine$SUFFIX"
-  echo 'fi'
-  echo
-}
-
-generate_postinst >> debian/wine-bin$VSUFFIX.postinst.debhelper
-generate_prerm >> debian/wine-bin$VSUFFIX.prerm.debhelper
-
-# return success
-true
diff --git a/debian/prep-install.sh b/debian/prep-install.sh
index 2d30966..8ea1689 100755
--- a/debian/prep-install.sh
+++ b/debian/prep-install.sh
@@ -78,7 +78,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 "debian/tmp/$tbin" ] || echo "$tbin" >> debian/$package$SUFFIX.${ext}
     done
   done
diff --git a/debian/rules b/debian/rules
index 746f757..3ea0360 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,16 +53,6 @@ space:=$(empty) $(empty)
 
 SHLIBS_OPTS = -Llibwine$(VERSUFFIX) -l$(subst $(space),:,$(patsubst %,$(CURDIR)/debian/libwine$(VERSUFFIX)/%,$(LIBDIRS)))
 
-ifeq (,$(VERSUFFIX))
-# Stable builds get priority 100 (plus 25 for 64-bit)
-ALTPRIO32 := 100
-ALTPRIO64 := 125
-else
-# Unstable builds get priority 50 (plus 25 for 64-bit)
-ALTPRIO32 := 50
-ALTPRIO64 := 75
-endif
-
 control-stamp: debian/control.in
 ifneq (,$(BUILDS))
 	bash debian/prep-control.sh "$(VERSUFFIX)"
@@ -199,8 +189,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
@@ -224,8 +212,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.4