*** empty log message ***

debian/changelog

@@ -1,7 +1,9 @@
 guile-1.6 (1.6.3-5) unstable; urgency=low
 
   * remove --list-missing from debian/rules. (closes: bug#187926)
-  * try fix for libqthreads-12 per-arch build problem. (closes: bug#183686)
+  * try fix for libqthreads-12 per-arch build problem. Try just producing
+    an empty libqthreads-12 .install file on unsupported arches.
+    (closes: bug#183686)
   * fix alpha qt assembly bugs. (closes: bug#186981)
 
  --

debian/control

@@ -9,7 +9,6 @@ Package: guile-1.6
 Section: interpreters
 Architecture: any
 Provides: guile
-Conflicts: guile
 Depends: ${shlibs:Depends}
 Suggests: guile-1.6-doc
 Description: The GNU extension language and Scheme interpreter
@@ -64,7 +63,7 @@ Description: Main Guile libraries
 
 Package: libqthreads-12
 Section: libs
-Architecture: i386 alpha
+Architecture: any
 Depends: ${shlibs:Depends}
 Description: QuickThreads library for Guile
  Guile is a Scheme implementation designed for real world programming,

debian/guile-1.6-slib.postinst

@@ -2,6 +2,6 @@
 
 set -e
 
-/usr/bin/guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
+/usr/bin/guile-1.6 -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
 
 #DEBHELPER#

debian/guile-1.6.menu

@@ -2,4 +2,4 @@
   needs="text" \
   section="Apps/Programming" \
   title="Guile 1.6"\
-  command="/usr/bin/guile"
+  command="/usr/bin/guile-1.6"

debian/guile-1.6.postinst

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" != "upgrade" ] ; then
+    update-alternatives \
+      --install /usr/bin/guile guile /usr/bin/guile-1.6 160 \
+      --slave /usr/bin/guile-config guile-config /usr/bin/guile-1.6-config \
+      --slave /usr/bin/guile-snarf guile-snarf /usr/bin/guile-1.6-snarf \
+      --slave /usr/bin/guile-tools guile-tools /usr/bin/guile-1.6-tools
+fi
+
+#DEBHELPER#

debian/guile-1.6.prerm

@@ -0,0 +1,9 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" != "upgrade" ] ; then
+    update-alternatives --remove guile /usr/bin/guile-1.6
+fi 
+
+#DEBHELPER#

debian/libqthreads-12.install

@@ -1 +1 @@
-debian/tmp/usr/lib/libqthreads.so.*
+

debian/rules

@@ -39,7 +39,6 @@ QTHREADS_DOT_INSTALLS := \
   $(foreach arch,${WORKING_QTHREADS_ARCHS},debian/guile-1.6-dev.install.${arch})
 
 ${QTHREADS_DOT_INSTALLS}: debian/guile-1.6-dev.install
-	echo ${DEBIAN_ARCHFILES}
 	cat $< > $@ && echo debian/tmp/usr/lib/libqthreads.la >> $@
 
 configure_args = \
@@ -52,6 +51,9 @@ configure_args = \
 	${ENABLE_THREADS}
 
 config-stamp: configure ${QTHREADS_DOT_INSTALLS}
+	$(foreach arch,${WORKING_QTHREADS_ARCHS},\
+	  echo 'debian/tmp/usr/lib/libqthreads.so.*' \
+	    > debian/libqthreads-12.install.${arch};)
 	@if test -d CVS || test -d .svn; \
 	then \
 	  echo ./configure --enable-maintainer-mode ${configure_args}; \
@@ -73,6 +75,7 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f config-stamp build-stamp ${QTHREADS_DOT_INSTALLS}
+	rm -f debian/libqthreads-12.install.*
 
 	-$(MAKE) clean
 	-$(MAKE) distclean
@@ -86,7 +89,20 @@ install: build
 	dh_clean -k
 	dh_installdirs
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-	dh_install --list-missing
+	dh_install
+
+	perl -p \
+	  -e 's|^#!\s*/usr/bin/guile([^-])|#!/usr/bin/guile-1.6$$1|o' \
+	  -e ' if $$. == 1;' \
+	  debian/guile-1.6/usr/bin/guile-config \
+	  debian/guile-1.6/usr/bin/guile-snarf \
+	  debian/guile-1.6/usr/bin/guile-tools
+
+	cd debian/guile-1.6/usr/bin/ \
+	  && mv guile guile-1.6 \
+	  && mv guile-config guile-1.6-config \
+	  && mv guile-snarf guile-1.6-snarf \
+	  && mv guile-tools guile-1.6-tools
 
 	mkdir -p debian/guile-1.6-slib/usr/share/guile/1.6
 	cd debian/guile-1.6-slib/usr/share/guile/1.6 && ln -s ../../slib .