8 files changed, 56 insertions, 27 deletions
diff --git a/debian/changelog b/debian/changelog
index 7c050e8..1566562 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,27 @@
-scm (5e3-6.1) unstable; urgency=low
+scm (5e4-1) unstable; urgency=low
 
-  * Non-maintainer upload. 
-  * Split doc-base file into two files, add missing 'Index' fields for 'info'
-    sections (closes: #369576).
-    Thanks to Robert Luberda for the patch.
-  * Remove from rules/postinst/postrm any manually doc-base handling code,
-    since dh_installdocs supports doc-base on its own.
-    Thanks to Robert Luberda for the patch.
+  * New upstream release.
+  * debian/control: Require at least version 3a5 of slib.
+  
+  * debian/postrm: New file to remove /usr/lib/scm/implcat and
+    /usr/lib/scm/slibcat upon purge.  (Closes: #455124).  Thanks to Kumar
+    Appaiah for the fix.
+  
+  * debian/control (Architecture): Add armel and armeb. (Closes: #408792).
+  
+  * debian/rules (install): Don't use -s when installing.  dh_strip should
+    be sufficient, and this should make the nostrip build option work.
+    (Closes: #438004).
 
- -- Neil Williams <codehelp@debian.org>  Sun, 15 Jul 2007 21:14:17 +0100
+  * continue.h: Repeat change from 5e1-2.
+  
+  * xgen.scm: Repeat change from 5e2-4.
+  
+  * scm.1: Repeat change from 5e2-4.
+  
+  * build.scm: Repeat change from 5e3-5.
+  
+ -- Thomas Bushnell, BSG <tb@debian.org>  Fri, 28 Dec 2007 15:56:00 -0800
 
 scm (5e3-6) unstable; urgency=medium
   
diff --git a/debian/control b/debian/control
index dff94c3..cca40a5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,13 @@ Section: interpreters
 Priority: optional
 Maintainer:  Thomas Bushnell, BSG <tb@debian.org>
 Standards-Version: 3.7.2
-Build-Depends: slib (>> 3a4), libncurses5-dev, libreadline5-dev, texi2html, texinfo, libx11-dev, debhelper (>= 5)
+Build-Depends: slib (>> 3a5), libncurses5-dev, libreadline5-dev, texi2html, texinfo, libx11-dev, debhelper (>= 5)
 
 Package: scm
-Architecture: alpha amd64 arm hppa i386 hurd-i386 m68k mips mipsel powerpc ppc64 sparc ia64
+Architecture: alpha amd64 arm hppa i386 hurd-i386 m68k mips mipsel powerpc ppc64 sparc ia64 armel armeb
 Section: interpreters
 Priority: optional
-Depends: slib (>> 3a4), ${shlibs:Depends}
+Depends: slib (>> 3a5), ${shlibs:Depends}
 Description: A Scheme language interpreter
  Scm conforms to Revised^5 Report on the Algorithmic Language Scheme and
  the IEEE P1178 specification.
diff --git a/debian/doc-base b/debian/doc-base
index d883c0d..c3c3a7e 100644
--- a/debian/doc-base
+++ b/debian/doc-base
@@ -5,10 +5,15 @@ Abstract: This manual describes the scheme interpreter scm.
 Section: Apps/Programming
 
 Format: info
-Index: /usr/share/info/scm.info.gz
 Files: /usr/share/info/scm.info.gz
 
+Format: info
+Files: /usr/share/info/Xlibscm.info.gz
+
 Format: HTML
 Index: /usr/share/doc/scm/scm.html
 Files: /usr/share/doc/scm/scm.html
 
+Format: HTML
+Index: /usr/share/doc/scm/Xlibscm.html
+Files: /usr/share/doc/scm/Xlibscm.html
diff --git a/debian/doc-base.scm-xlib b/debian/doc-base.scm-xlib
deleted file mode 100644
index c73ba3a..0000000
--- a/debian/doc-base.scm-xlib
+++ /dev/null
@@ -1,13 +0,0 @@
-Document: scm-xlib
-Title:  X Interface for SCM scheme interpreter
-Author:  Aubrey Jaffer
-Abstract: This manual describes the  X Interface for scheme interpreter SCM.
-Section: Apps/Programming
-
-Format: info
-Index: /usr/share/info/Xlibscm.info.gz
-Files: /usr/share/info/Xlibscm.info.gz
-
-Format: HTML
-Index: /usr/share/doc/scm/Xlibscm.html
-Files: /usr/share/doc/scm/Xlibscm.html
diff --git a/debian/postinst b/debian/postinst
index d93fe02..aa235c4 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -11,6 +11,12 @@ install-info --quiet --section "The Algorithmic Language Scheme" \
   --description="SCM Language X Interface" \
   /usr/share/info/Xlibscm.info.gz
 
+# doc base support
+if [ "$1" = configure ]; then
+    if test -x /usr/sbin/install-docs >/dev/null 2>&1; then
+        /usr/sbin/install-docs -i /usr/share/doc-base/scm
+    fi
+fi
 
 rm -f /usr/lib/scm/slibcat
 /usr/bin/scm -c "(require 'new-catalog)"
diff --git a/debian/postrm b/debian/postrm
new file mode 100644
index 0000000..70022ef
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = purge ] && [ -e /usr/lib/scm/implcat ] && [ -e /usr/lib/scm/slibcat ]; then
+   rm -f /usr/lib/scm/implcat /usr/lib/scm/slibcat
+fi
+
+#DEBHELPER#
diff --git a/debian/prerm b/debian/prerm
index c2c654c..37960c3 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -6,6 +6,12 @@ if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/scm ]; then
 	rm -f /usr/doc/scm
 fi
 
+# doc base support
+if [ "$1" = remove -o "$1" = upgrade ]; then
+    if test -x /usr/sbin/install-docs >/dev/null 2>&1; then
+        /usr/sbin/install-docs -r scm
+    fi
+fi
 
 install-info --quiet --remove /usr/share/info/scm.info.gz
 
diff --git a/debian/rules b/debian/rules
index 4074fc5..37527c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -119,7 +119,7 @@ install: build
 
 # binaries
 	$(INSTALL_DIR) debian/scm/usr/bin
-	$(INSTALL_PROGRAM) -s scm debian/scm/usr/bin
+	$(INSTALL_PROGRAM) scm debian/scm/usr/bin
 
 # library
 	$(INSTALL_DIR) debian/scm/usr/lib/scm
@@ -148,6 +148,9 @@ install: build
 	$(INSTALL_DATA) Xlibscm.html debian/scm/usr/share/doc/scm
 	$(INSTALL_DATA) debian/copyright debian/scm/usr/share/doc/scm
 
+	$(INSTALL_DIR) debian/scm/usr/share/doc-base
+	$(INSTALL_DATA) debian/doc-base debian/scm/usr/share/doc-base/scm
+
 # examples
 	$(INSTALL_DIR) debian/scm/usr/share/doc/scm/examples
 	$(INSTALL_DATA) r4rstest.scm debian/scm/usr/share/doc/scm/examples