Import Debian changes 3a1-4.2debian/3a1-4.2

slib (3a1-4.2) unstable; urgency=low

  * Non-maintainer upload.
  * Add guile.init.local for use within the build dir, since otherwise we
    have an (earlier unnoticed) circular build-dep due to a difference
    between scm and guile.

slib (3a1-4.1) unstable; urgency=low

  * Non-maintainer upload.
  * Build-depend on guile-1.6 instead of scm, since the new version of
    scm is wedged in unstable (closes: #281809).

slib (3a1-4) unstable; urgency=low

  * Also check for expected creation on slibcat. (Closes: #240096)

slib (3a1-3) unstable; urgency=low

  * Also check for /usr/share/guile/1.6/slib before installing for guile
    1.6. (Closes: #239267)

slib (3a1-2) unstable; urgency=low

  * Add format.scm back into slib until gnucash stops using it.
  * Call guile-1.6 new-catalog (Closes: #238231)

slib (3a1-1) unstable; urgency=low

  * New upstream release
  * Remove Info section from doc-base file (Closes: #186950)
  * Remove period from end of description (linda, lintian)
  * html gen fixed upstream (Closes: #111778)

slib (2d4-2) unstable; urgency=low

  * Fix url for upstream source (Closes: #144981)
  * Fix typo in slib.texi (enquque->enqueue) (Closes: #147475)
  * Add build depends.

slib (2d4-1) unstable; urgency=low

  * New upstream.

slib (2d3-1) unstable; urgency=low

  * New upstream.
  * Remove texi2html call in debian/rules.  Now done upstream.  Add make
    html instead.
  * Changes to rules and doc-base to conform to upstream html gen
  * Clean up upstream makefile to make sure it cleans up after itself.

6 files changed, 92 insertions, 23 deletions

diff --git a/debian/changelog b/debian/changelog
index 411c3c4..99d04fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,73 @@
+slib (3a1-4.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add guile.init.local for use within the build dir, since otherwise we
+    have an (earlier unnoticed) circular build-dep due to a difference
+    between scm and guile.
+
+ -- Steve Langasek <vorlon@debian.org>  Mon, 10 Jan 2005 08:53:33 +0000
+
+slib (3a1-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Build-depend on guile-1.6 instead of scm, since the new version of
+    scm is wedged in unstable (closes: #281809).
+
+ -- Steve Langasek <vorlon@debian.org>  Sat,  8 Jan 2005 17:56:08 -0800
+
+slib (3a1-4) unstable; urgency=low
+
+  * Also check for expected creation on slibcat. (Closes: #240096)
+
+ -- James LewisMoss <dres@debian.org>  Sun, 28 Mar 2004 17:29:19 -0500
+
+slib (3a1-3) unstable; urgency=low
+
+  * Also check for /usr/share/guile/1.6/slib before installing for guile
+    1.6. (Closes: #239267)
+
+ -- James LewisMoss <dres@debian.org>  Mon, 22 Mar 2004 20:53:40 -0500
+
+slib (3a1-2) unstable; urgency=low
+
+  * Add format.scm back into slib until gnucash stops using it.
+  * Call guile-1.6 new-catalog (Closes: #238231)
+
+ -- James LewisMoss <dres@debian.org>  Sat, 20 Mar 2004 16:51:07 -0500
+
+slib (3a1-1) unstable; urgency=low
+
+  * New upstream release
+  * Remove Info section from doc-base file (Closes: #186950)
+  * Remove period from end of description (linda, lintian)
+  * html gen fixed upstream (Closes: #111778)
+
+ -- James LewisMoss <dres@debian.org>  Sun, 14 Mar 2004 11:56:11 -0500
+
+slib (2d4-2) unstable; urgency=low
+
+  * Fix url for upstream source (Closes: #144981)
+  * Fix typo in slib.texi (enquque->enqueue) (Closes: #147475)
+  * Add build depends.
+
+ -- James LewisMoss <dres@debian.org>  Thu, 23 May 2002 13:33:33 -0400
+
+slib (2d4-1) unstable; urgency=low
+
+  * New upstream.
+
+ -- James LewisMoss <dres@debian.org>  Fri, 17 May 2002 11:23:06 -0400
+
+slib (2d3-1) unstable; urgency=low
+
+  * New upstream.
+  * Remove texi2html call in debian/rules.  Now done upstream.  Add make
+    html instead.
+  * Changes to rules and doc-base to conform to upstream html gen
+  * Clean up upstream makefile to make sure it cleans up after itself.
+
+ -- James LewisMoss <dres@debian.org>  Sat,  6 Apr 2002 16:27:35 -0500
+
 slib (2d2-1) unstable; urgency=low
 
   * New upstream version
@@ -52,7 +122,7 @@ slib (2c7-1) unstable; urgency=low
 slib (2c6-2) unstable; urgency=low
 
   * Remove the slib$(VERSION).info file.  Cut the diff back down to
-    size. 
+    size.
 
  -- James LewisMoss <dres@debian.org>  Sat, 13 Nov 1999 14:10:38 -0500
 
@@ -95,7 +165,7 @@ slib (2c5-3) unstable; urgency=low
 slib (2c5-2) unstable; urgency=low
 
   * Link mklibcat.scm to mklibcat.  Fixes a problem with using slib with
-    guile. 
+    guile.
 
  -- James LewisMoss <dres@debian.org>  Sun,  7 Mar 1999 21:51:35 -0500
 
@@ -159,5 +229,3 @@ slib (2a6-1) unstable; urgency=low
   * First Debian release.
 
  -- Karl Sackett <krs@debian.org>  Mon, 16 Dec 1996 09:23:46 -0600
-
-
diff --git a/debian/control b/debian/control
index d4392b7..084f82f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,14 @@ Source: slib
 Section: devel
 Priority: optional
 Maintainer: James LewisMoss <dres@debian.org>
-Standards-Version: 3.0.0
+Build-Depends-Indep: guile-1.6, texi2html, texinfo
+Standards-Version: 3.1.0
 
 Package: slib
 Section: devel
 Priority: optional
 Architecture: all
-Description: Portable Scheme library.
+Description: Portable Scheme library
  SLIB is a portable scheme library meant to provide compatibility and
  utility functions for all standard scheme implementations.  SLIB
  includes initialization files for Chez, ELK 2.1, GAMBIT, MacScheme,
diff --git a/debian/copyright b/debian/copyright
index 2a18aa9..0445f9e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,10 @@
 This is the Debian GNU/Linux prepackaged version of slib.
 
-This package was put together by Rob Browning <rlb@cs.utexas.edu>
-from sources obtained from:
+This package was put together by Rob Browning <rlb@cs.utexas.edu> and
+continued by James LewisMoss <dres@debian.org> from sources obtained
+from:
 
-	ftp://swiss-ftp.ai.mit.edu/archive/scm/slib2d1.zip
+	http://swissnet.ai.mit.edu/ftpdir/scm/slib2d4.zip
 
 For more information see:
 
diff --git a/debian/doc-base b/debian/doc-base
index 72e6327..dc4d265 100644
--- a/debian/doc-base
+++ b/debian/doc-base
@@ -5,11 +5,6 @@ Abstract: This manual describes the facilities and functions
  provided by the slib scheme library.
 Section: Apps/Programming
 
-Format: Info
-Section: The Algorithmic Language Scheme
-Index: /usr/share/info/slib.info.gz
-Files: /usr/share/info/slib.info.gz
-
 Format: HTML
-Index: /usr/share/doc/slib/slib.html
-Files: /usr/share/doc/slib/slib.html
+Index: /usr/share/doc/slib/slib_toc.html
+Files: /usr/share/doc/slib/slib_*.html
diff --git a/debian/postinst b/debian/postinst
index 847a44a..88aa502 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -15,10 +15,12 @@ if [ -x /usr/sbin/guile1.4-slibconfig ] ; then
     /usr/sbin/guile1.4-slibconfig
 fi
 
-if [ "$1" = "configure" ]; then
-	if [ -d /usr/doc -a ! -e /usr/doc/slib -a -d /usr/share/doc/slib ]; then
-		ln -sf ../share/doc/slib /usr/doc/slib
-	fi
+if [ -x /usr/bin/guile-1.6 -a -e /usr/share/guile/1.6/slib ] ; then
+    rm -f /usr/share/guile/1.6/slibcat
+    /usr/bin/guile-1.6 -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
+    if [ -e /usr/share/guile/1.6/slibcat ] ; then
+      chmod 644 /usr/share/guile/1.6/slibcat
+    fi
 fi
 
 # doc base support
diff --git a/debian/rules b/debian/rules
index f690acd..ed0da6b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,9 @@
 #! /usr/bin/make -f
 # -*-Makefile-*-
 
+SCHEME_LIBRARY_PATH=./
+export SCHEME_LIBRARY_PATH
+
 CC =gcc
 CFLAGS =-O2 -g -Wall
 LDFLAGS =
@@ -17,12 +20,11 @@ INSTALL_MAN =$(INSTALL) -m 444 -o root -g root
 build:
 	$(checkdir)
 	make
-	texi2html -monolithic slib.texi
+	make html
 	touch build
 
 clean:
 	$(checkdir)
-	-rm slib.html
 	-rm slib.info*
 	make clean
 	-rm -f build
@@ -60,7 +62,7 @@ binary-indep: checkroot build
 	gzip -9v debian/tmp/usr/share/doc/slib/README
 	$(INSTALL_DATA) FAQ debian/tmp/usr/share/doc/slib
 	gzip -9v debian/tmp/usr/share/doc/slib/FAQ
-	$(INSTALL_DATA) slib.html debian/tmp/usr/share/doc/slib
+	$(INSTALL_DATA) slib_html/*.html debian/tmp/usr/share/doc/slib
 
 	$(INSTALL_DIR) debian/tmp/usr/share/slib/init
 	$(INSTALL_DATA) *.init debian/tmp/usr/share/slib/init