Import Debian changes 5e1-1debian/5e1-1

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

  * New upstream release.  (Closes: #335970)
  * debian/rules (SCM_OPTIONS): Remove -F turtlegr; the file supporting
    this option seems to have gone by the wayside.
  * debian/rules (binary-arch): Don't try to install grtest.scm; it's gone
    now.
    
  * debian/rules (build-stamp): Use tee to capture output of ./build so
    that we can capture a copy of the file in the build log.
    
  * scm.1: Fix spelling errors in manual page:
     verobse -> verbose; 
     qoutes -> quotes;
     aguments -> arguments;
     neccessary -> necessary;
     preceeds -> precedes.
     syncronization -> synchronization.
     (Closes: #300131)
    
  * debian/postinst, debian/prerm: Assume that install-docs is in the
    standard place, and test for it there with test -x.  (Closes: #292996)

4 files changed, 33 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index ea4dba7..d3b5b21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+scm (5e1-1) unstable; urgency=low
+
+  * New upstream release.  (Closes: #335970)
+  * debian/rules (SCM_OPTIONS): Remove -F turtlegr; the file supporting
+    this option seems to have gone by the wayside.
+  * debian/rules (binary-arch): Don't try to install grtest.scm; it's gone
+    now.
+    
+  * debian/rules (build-stamp): Use tee to capture output of ./build so
+    that we can capture a copy of the file in the build log.
+    
+  * scm.1: Fix spelling errors in manual page:
+     verobse -> verbose; 
+     qoutes -> quotes;
+     aguments -> arguments;
+     neccessary -> necessary;
+     preceeds -> precedes.
+     syncronization -> synchronization.
+     (Closes: #300131)
+    
+  * debian/postinst, debian/prerm: Assume that install-docs is in the
+    standard place, and test for it there with test -x.  (Closes: #292996)
+  
+ -- Thomas Bushnell, BSG <tb@debian.org>  Thu, 27 Oct 2005 12:00:49 -0700
+
 scm (5d9-5) unstable; urgency=low
 
   * New maintainer.  Adopted with permission of previous maintainer.
@@ -9,7 +34,7 @@ scm (5d9-5) unstable; urgency=low
   
   * debian/control (Build-Depends): Use libreadline5-dev in place of
     libreadline4-dev. (Closes: #326297)
-
+  
  -- Thomas Bushnell, BSG <tb@debian.org>  Wed, 26 Oct 2005 19:31:02 -0700
 
 scm (5d9-4.1) unstable; urgency=high
diff --git a/debian/postinst b/debian/postinst
index e188be8..5ce83d5 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -13,7 +13,7 @@ install-info --quiet --section "The Algorithmic Language Scheme" \
 
 # doc base support
 if [ "$1" = configure ]; then
-    if command -v install-docs >/dev/null 2>&1; then
-        install-docs -i /usr/share/doc-base/scm
+    if test -x /usr/sbin/install-docs >/dev/null 2>&1; then
+        /usr/sbin/install-docs -i /usr/share/doc-base/scm
     fi
 fi
diff --git a/debian/prerm b/debian/prerm
index 968aa17..dbc91e8 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -8,8 +8,8 @@ fi
 
 # doc base support
 if [ "$1" = remove -o "$1" = upgrade ]; then
-    if command -v install-docs >/dev/null 2>&1; then
-        install-docs -r scm
+    if test -x /usr/sbin/install-docs >/dev/null 2>&1; then
+        /usr/sbin/install-docs -r scm
     fi
 fi
 
diff --git a/debian/rules b/debian/rules
index 9ed76c6..5049713 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,12 +39,12 @@ SCM_OPTIONS = -p linux  \
   -F unix \
   -F curses \
   -F dynamic-linking \
-  -F turtlegr \
   -F xlib \
   -F dump \
   -F macro
 
 #  -F dump
+#  -F turtlegr
 
 #   -F heap-can-shrink \
 
@@ -68,7 +68,7 @@ else
 endif
 	test -e /usr/share/slib || \
 	  (echo "Must have slib installed for compile" && exit 1)
-	./build ${SCM_OPTIONS} > debian/bld
+	./build ${SCM_OPTIONS} | tee debian/bld
 	chmod ug+x debian/bld
 	debian/bld
 	make scm.info
@@ -142,8 +142,8 @@ binary-arch: checkroot build
 	$(INSTALL_DATA) pi.scm debian/tmp/usr/share/doc/scm/examples
 	$(INSTALL_DATA) pi.c debian/tmp/usr/share/doc/scm/examples
 	$(INSTALL_DATA) bench.scm debian/tmp/usr/share/doc/scm/examples
-	$(INSTALL_DATA) grtest.scm debian/tmp/usr/share/doc/scm/examples
 	$(INSTALL_DATA) split.scm debian/tmp/usr/share/doc/scm/examples
+#	$(INSTALL_DATA) grtest.scm debian/tmp/usr/share/doc/scm/examples
 
 # info pages
 	$(INSTALL_DIR) debian/tmp/usr/share/info