6 files changed, 26 insertions, 21 deletions
diff --git a/debian/changelog b/debian/changelog
index 13c4c63..7c050e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+scm (5e3-6.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.
+
+ -- Neil Williams <codehelp@debian.org>  Sun, 15 Jul 2007 21:14:17 +0100
+
 scm (5e3-6) unstable; urgency=medium
   
   * Medium urgency because this is a release critical issue, 
diff --git a/debian/doc-base b/debian/doc-base
index c3c3a7e..d883c0d 100644
--- a/debian/doc-base
+++ b/debian/doc-base
@@ -5,15 +5,10 @@ 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
new file mode 100644
index 0000000..c73ba3a
--- /dev/null
+++ b/debian/doc-base.scm-xlib
@@ -0,0 +1,13 @@
+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 aa235c4..d93fe02 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -11,12 +11,6 @@ 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/prerm b/debian/prerm
index 37960c3..c2c654c 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -6,12 +6,6 @@ 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 b2deef9..4074fc5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -148,9 +148,6 @@ 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