Import Debian changes 5d9-4.1debian/5d9-4.1

scm (5d9-4.1) unstable; urgency=high

  * Non-maintainer upload.
  * High-urgency upload for sarge-targetted RC bugfix.
  * Revert upstream "CAUTIOUS" define, which causes the scm build to
    fail its test suite on alpha (and, it appears, powerpc as well).
    Closes: #245810.

scm (5d9-4) unstable; urgency=low

  * Apply patch from 144062 to fix hppa build (Closes: #144062)
  * Change scm.1 section from Jan 4 200 to 1. (lintian)

scm (5d9-3) unstable; urgency=low

  * Properly clean up info files.
  * Make and install Xlibscm.info.

scm (5d9-2) unstable; urgency=low

  * Fix path problem in slibcat.  Hack at mklibcat.scm.  (Closes: #241510)

scm (5d9-1) unstable; urgency=low

  * New upstream release
  * Merge NMU sparc changes (Closes: #191171, #191356)
  * SHORT_INT is defined for ia64 upstream (Closes: #141928)
  * Scheme imps now grouped in info file (has been for a while)
  (Closes: #115452)

6 files changed, 64 insertions, 19 deletions

diff --git a/debian/changelog b/debian/changelog
index e25b173..179bb8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,42 @@
-scm (5d6-3.2) unstable; urgency=low
+scm (5d9-4.1) unstable; urgency=high
 
-  * Fix hppa compile.  Closes: #144062
+  * Non-maintainer upload.
+  * High-urgency upload for sarge-targetted RC bugfix.
+  * Revert upstream "CAUTIOUS" define, which causes the scm build to
+    fail its test suite on alpha (and, it appears, powerpc as well).
+    Closes: #245810.
 
- -- LaMont Jones <lamont@debian.org>  Wed,  7 May 2003 08:36:40 -0600
+ -- Steve Langasek <vorlon@debian.org>  Tue,  7 Dec 2004 23:23:48 -0800
+
+scm (5d9-4) unstable; urgency=low
+
+  * Apply patch from 144062 to fix hppa build (Closes: #144062)
+  * Change scm.1 section from Jan 4 200 to 1. (lintian)
+
+ -- James LewisMoss <dres@debian.org>  Thu,  6 May 2004 14:24:32 -0400
+
+scm (5d9-3) unstable; urgency=low
+
+  * Properly clean up info files.
+  * Make and install Xlibscm.info.
+
+ -- James LewisMoss <dres@debian.org>  Sat,  3 Apr 2004 15:44:38 -0500
+
+scm (5d9-2) unstable; urgency=low
+
+  * Fix path problem in slibcat.  Hack at mklibcat.scm.  (Closes: #241510)
+
+ -- James LewisMoss <dres@debian.org>  Sat,  3 Apr 2004 15:35:52 -0500
+
+scm (5d9-1) unstable; urgency=low
+
+  * New upstream release
+  * Merge NMU sparc changes (Closes: #191171, #191356)
+  * SHORT_INT is defined for ia64 upstream (Closes: #141928)
+  * Scheme imps now grouped in info file (has been for a while)
+  (Closes: #115452)
+
+ -- James LewisMoss <dres@debian.org>  Sun, 14 Mar 2004 11:44:51 -0500
 
 scm (5d6-3.1) unstable; urgency=low
 
@@ -52,7 +86,7 @@ scm (5d4-3) unstable; urgency=low
   * Don't link with regexx, but just use libc6's regular expression
     functions.
   * Define (terms) to output /usr/share/common-licenses/GPL (Closes:
-    #119321) 
+    #119321)
 
  -- James LewisMoss <dres@debian.org>  Wed, 12 Dec 2001 16:27:02 -0500
 
@@ -193,7 +227,7 @@ scm (5c3-4) frozen unstable; urgency=low
 scm (5c3-3) frozen unstable; urgency=low
 
   * -nw
-  * Fixes #16762. 
+  * Fixes #16762.
   * Fixes #18163.
   * Fixes #18164.
   * Fixes #23743.
@@ -235,4 +269,3 @@ scm (4e6-1) unstable; urgency=low
   * Makefile.in: scm compiles with regex.
 
  -- Karl Sackett <krs@debian.org>  Fri, 13 Dec 1996 08:55:23 -0600
-
diff --git a/debian/control b/debian/control
index 533edb2..42b1b1d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,13 @@ Section: interpreters
 Priority: optional
 Maintainer:  James LewisMoss <dres@debian.org>
 Standards-Version: 3.1.1
-Build-Depends: slib, libncurses5-dev, libreadline4-dev, texi2html, texinfo, xlibs-dev
+Build-Depends: slib (>> 3a1), libncurses5-dev, libreadline4-dev, texi2html, texinfo, xlibs-dev
 
 Package: scm
 Architecture: any
 Section: interpreters
 Priority: optional
 Depends: slib, ${shlibs:Depends}
-Description: A Scheme language interpreter.
+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/copyright b/debian/copyright
index 419226e..a9a786e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,11 +4,11 @@ This package was put together by Karl Sackett <krs@debian.org>, and
 upgraded by James LewisMoss <dres@debian.org> from sources obtained
 from:
 
-	ftp://swiss-ftp.ai.mit.edu/archive/scm/scm5d0.tar.gz
+	ftp://swissnet.ai.mit.edu/ftpdir/scm/scm5d9.tar.gz
 
 For more information see:
 
-	http://www-swiss.ai.mit.edu/~jaffer/SCM.html
+	http://www-swiss.ai.mit.edu/~jaffer/SCM
 
 License:
 
diff --git a/debian/doc-base b/debian/doc-base
index 59abf3f..1e9e5f3 100644
--- a/debian/doc-base
+++ b/debian/doc-base
@@ -7,6 +7,13 @@ Section: Apps/Programming
 Format: info
 Files: /usr/share/info/scm.info
 
+Format: info
+Files: /usr/share/info/Xlibscm.info
+
 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/postinst b/debian/postinst
index c762db4..e188be8 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -6,11 +6,10 @@ install-info --quiet --section "The Algorithmic Language Scheme" \
   --description="A Scheme language interpreter" \
   /usr/share/info/scm.info.gz
 
-if [ "$1" = "configure" ]; then
-	if [ -d /usr/doc -a ! -e /usr/doc/scm -a -d /usr/share/doc/scm ]; then
-		ln -sf ../share/doc/scm /usr/doc/scm
-	fi
-fi
+install-info --quiet --section "The Algorithmic Language Scheme" \
+  "The Algorithmic Language Scheme" \
+  --description="SCM Language X Interface" \
+  /usr/share/info/Xlibscm.info.gz
 
 # doc base support
 if [ "$1" = configure ]; then
diff --git a/debian/rules b/debian/rules
index da0e302..9ed76c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,6 +48,8 @@ SCM_OPTIONS = -p linux  \
 
 #   -F heap-can-shrink \
 
+#SCHEME_LIBRARY_PATH=../slib-3a1/
+#export SCHEME_LIBRARY_PATH
 NON_LIB_FILES = 'bench.scm|build.scm|example.scm|r4rstest.scm|pi.scm|grtest.scm'
 
 #test: stamp-configure
@@ -70,14 +72,17 @@ endif
 	chmod ug+x debian/bld
 	debian/bld
 	make scm.info
+	make Xlibscm.info
 	texi2html -monolithic scm.texi
+	texi2html -monolithic Xlibscm.texi
 	touch build-stamp
 
 clean:
 	$(checkdir)
 	-rm -f scm.info* scm.html tmp1 tmp2 scmflags.h scmlit
+	-rm -f Xlibscm.info*
 	-rm -f features.txi platform.txi
-	-rm -f scm5d0.info
+	-rm -f *.info
 	-rm require.scm scm
 	make distclean
 	-rm -f srcdir.mk
@@ -89,7 +94,7 @@ binary-indep: checkroot
 	$(checkdir)
 
 binary-arch: checkroot build
-	$(checkdir)	
+	$(checkdir)
 	-rm -rf debian/tmp*
 
 # debian/tmp
@@ -114,7 +119,7 @@ binary-arch: checkroot build
 # man pages
 	$(INSTALL_DIR) debian/tmp/usr/share/man/man1
 	$(INSTALL_MAN)	scm.1 debian/tmp/usr/share/man/man1
-	gzip -9vr debian/tmp/usr/share/man
+	gzip -9vr debian/tmp/usr/share/man || true
 
 # documentation
 	$(INSTALL_DIR) debian/tmp/usr/share/doc/scm
@@ -124,6 +129,7 @@ binary-arch: checkroot build
 	$(INSTALL_DATA) README debian/tmp/usr/share/doc/scm
 	gzip -9v debian/tmp/usr/share/doc/scm/*
 	$(INSTALL_DATA) scm.html debian/tmp/usr/share/doc/scm
+	$(INSTALL_DATA) Xlibscm.html debian/tmp/usr/share/doc/scm
 	$(INSTALL_DATA) debian/copyright debian/tmp/usr/share/doc/scm
 
 	$(INSTALL_DIR) debian/tmp/usr/share/doc-base
@@ -142,6 +148,7 @@ binary-arch: checkroot build
 # info pages
 	$(INSTALL_DIR) debian/tmp/usr/share/info
 	$(INSTALL_DATA) scm.info* debian/tmp/usr/share/info
+	$(INSTALL_DATA) Xlibscm.info* debian/tmp/usr/share/info
 	gzip -9 debian/tmp/usr/share/info/*
 
 	dpkg-shlibdeps scm