Import Debian changes 2c7-1debian/2c7-1

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

  * New upstream.
  * Add slibconfig back in.

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

  * Remove the slib$(VERSION).info file.  Cut the diff back down to
    size. 

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

  * New upstream.
  * Move docs to /usr/share. Up standards version. add /usr/doc symlink.
    Move info files.  Remove undocumented link.

slib (2c5-6) unstable; urgency=low

  * Lowercase two vars in yasyn.scm (Fixes bug #37222)

slib (2c5-5) unstable; urgency=low

  * Fix it so string-index isn't defined (now there is a
    strsrch:string-index) (Fixes #38812)

slib (2c5-4) unstable; urgency=low

  * Don't run slibconfig in postinst.  (Fixes bug #38253, #37733, #37715,
    #37746,  #37809, #37917, #38123, #38462)

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

  * Run slibconfig in postinst.  It was commented out there, but I don't
    see any old bug reports on why it was commented out, so let's try
    again. :)  (Fixes bug #37221)

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

  * Link mklibcat.scm to mklibcat.  Fixes a problem with using slib with
    guile. 

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

  * New upstream.

slib (2c3-4) unstable; urgency=low

  * New maintainer.

6 files changed, 110 insertions, 22 deletions

diff --git a/debian/changelog b/debian/changelog
index 3c6329a..1c67c6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,72 @@
+slib (2c7-1) unstable; urgency=low
+
+  * New upstream.
+  * Add slibconfig back in.
+
+ -- James LewisMoss <dres@debian.org>  Mon,  6 Dec 1999 19:32:57 -0500
+
+slib (2c6-2) unstable; urgency=low
+
+  * Remove the slib$(VERSION).info file.  Cut the diff back down to
+    size. 
+
+ -- James LewisMoss <dres@debian.org>  Sat, 13 Nov 1999 14:10:38 -0500
+
+slib (2c6-1) unstable; urgency=low
+
+  * New upstream.
+  * Move docs to /usr/share. Up standards version. add /usr/doc symlink.
+    Move info files.  Remove undocumented link.
+
+ -- James LewisMoss <dres@debian.org>  Sat, 13 Nov 1999 12:56:18 -0500
+
+slib (2c5-6) unstable; urgency=low
+
+  * Lowercase two vars in yasyn.scm (Fixes bug #37222)
+
+ -- James LewisMoss <dres@debian.org>  Sat, 10 Jul 1999 19:17:04 -0400
+
+slib (2c5-5) unstable; urgency=low
+
+  * Fix it so string-index isn't defined (now there is a
+    strsrch:string-index) (Fixes #38812)
+
+ -- James LewisMoss <dres@debian.org>  Fri,  9 Jul 1999 21:30:19 -0400
+
+slib (2c5-4) unstable; urgency=low
+
+  * Don't run slibconfig in postinst.  (Fixes bug #38253, #37733, #37715,
+    #37746,  #37809, #37917, #38123, #38462)
+
+ -- James LewisMoss <dres@debian.org>  Thu,  3 Jun 1999 20:19:53 -0400
+
+slib (2c5-3) unstable; urgency=low
+
+  * Run slibconfig in postinst.  It was commented out there, but I don't
+    see any old bug reports on why it was commented out, so let's try
+    again. :)  (Fixes bug #37221)
+
+ -- James LewisMoss <dres@debian.org>  Wed, 12 May 1999 22:37:02 -0400
+
+slib (2c5-2) unstable; urgency=low
+
+  * Link mklibcat.scm to mklibcat.  Fixes a problem with using slib with
+    guile. 
+
+ -- James LewisMoss <dres@debian.org>  Sun,  7 Mar 1999 21:51:35 -0500
+
+slib (2c5-1) unstable; urgency=low
+
+  * New upstream.
+
+ -- James LewisMoss <dres@debian.org>  Sun,  7 Mar 1999 10:10:27 -0500
+
+slib (2c3-4) unstable; urgency=low
+
+  * New maintainer.
+
+ -- James LewisMoss <dres@debian.org>  Fri, 26 Feb 1999 00:52:26 -0500
+
 slib (2c3-3) frozen unstable; urgency=low
 
   * Fixes #16235.
@@ -49,4 +118,5 @@ slib (2a6-1) unstable; urgency=low
 
 Local variables:
 mode: debian-changelog
+add-log-mailing-address: "dres@debian.org"
 End:
diff --git a/debian/control b/debian/control
index a1211f3..3b3cde5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: slib
 Section: devel
 Priority: optional
-Maintainer: David N. Welton <davidw@efn.org>
-Standards-Version: 2.1.1.2
+Maintainer: James LewisMoss <dres@debian.org>
+Standards-Version: 3.0.0
 
 Package: slib
 Architecture: all
diff --git a/debian/postinst b/debian/postinst
index b298e51..2e719ac 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,5 +3,15 @@ set -e
 
 install-info --quiet --section "Development" "Development" \
   --description="The SLIB portable Scheme library" \
-  /usr/info/slib.info.gz
-# /usr/sbin/slibconfig
+  /usr/share/info/slib.info.gz
+
+# OK.  This is bad because it really should be in the guile config or in some
+# emacs-commond sort of package.
+#/usr/sbin/slibconfig
+
+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
+fi
+
diff --git a/debian/postrm b/debian/postrm
index 03e39ad..abf12d1 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -2,3 +2,4 @@
 set -e
 
 install-info --quiet --remove slib
+
diff --git a/debian/prerm b/debian/prerm
new file mode 100644
index 0000000..853a5c4
--- /dev/null
+++ b/debian/prerm
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/slib ]; then
+	rm -f /usr/doc/slib
+fi
+
diff --git a/debian/rules b/debian/rules
index 7cba850..1a8c9a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,43 +39,42 @@ binary-indep: checkroot build
 	$(INSTALL_DIR) debian/tmp
 	$(INSTALL_DIR) debian/tmp/DEBIAN
 	$(INSTALL_PROGRAM) debian/postinst debian/tmp/DEBIAN
+	$(INSTALL_PROGRAM) debian/prerm debian/tmp/DEBIAN
 	$(INSTALL_PROGRAM) debian/postrm debian/tmp/DEBIAN
 
 # library
 	$(INSTALL_DIR) debian/tmp/usr/share/slib
 	$(INSTALL_DATA) *.scm debian/tmp/usr/share/slib
+	# this fixes a load problem with guile
+	( cd debian/tmp/usr/share/slib ; ln -s mklibcat.scm mklibcat )
 
 # documentation
-	$(INSTALL_DIR) debian/tmp/usr/doc/slib
-	$(INSTALL_DATA) debian/copyright debian/tmp/usr/doc/slib
+	$(INSTALL_DIR) debian/tmp/usr/share/doc/slib
+	$(INSTALL_DATA) debian/copyright debian/tmp/usr/share/doc/slib
 	$(INSTALL_DATA) debian/changelog \
-	  debian/tmp/usr/doc/slib/changelog.Debian
-	gzip -9v debian/tmp/usr/doc/slib/changelog.Debian
+	  debian/tmp/usr/share/doc/slib/changelog.Debian
+	gzip -9v debian/tmp/usr/share/doc/slib/changelog.Debian
 
-	$(INSTALL_DATA) ChangeLog debian/tmp/usr/doc/slib
-	gzip -9v debian/tmp/usr/doc/slib/ChangeLog
-	$(INSTALL_DATA) README debian/tmp/usr/doc/slib
-	gzip -9v debian/tmp/usr/doc/slib/README
-	$(INSTALL_DATA) FAQ debian/tmp/usr/doc/slib
-	gzip -9v debian/tmp/usr/doc/slib/FAQ
-	$(INSTALL_DATA) slib.html debian/tmp/usr/doc/slib
+	$(INSTALL_DATA) ChangeLog debian/tmp/usr/share/doc/slib/changelog
+	gzip -9v debian/tmp/usr/share/doc/slib/changelog
+	$(INSTALL_DATA) README debian/tmp/usr/share/doc/slib
+	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_DIR) debian/tmp/usr/share/slib/init
 	$(INSTALL_DATA) *.init debian/tmp/usr/share/slib/init
 
 # info pages
-	$(INSTALL_DIR) debian/tmp/usr/info
-	$(INSTALL_DATA) slib.info* debian/tmp/usr/info
-	gzip -9v debian/tmp/usr/info/*
+	$(INSTALL_DIR) debian/tmp/usr/share/info
+	$(INSTALL_DATA) slib.info* debian/tmp/usr/share/info
+	gzip -9v debian/tmp/usr/share/info/*
 
 # slibconfig
 
 	$(INSTALL_DIR) debian/tmp/usr/sbin
 	$(INSTALL_PROGRAM) debian/slibconfig debian/tmp/usr/sbin
-	$(INSTALL_DIR) debian/tmp/usr/man/man8
-	(cd debian/tmp/usr/man/man8; \
-	 ln -s ../man7/undocumented.7.gz slibconfig.8.gz \
-	) 
 
 	dpkg-gencontrol
 	dpkg --build debian/tmp ..