Import Debian changes 5d2-3debian/5d2-3

scm (5d2-3) unstable frozen; urgency=low

  * Fix libncurses4-dev -> libncurses5-dev build depend (Closes: #58435)
  * Fix libreadline2-dev -> libreadline4-dev build depend.
  * Fix license location in copyright file (lintian warning)
  * Add tetex-bin as a build depend (needs makeinfo) (Closes: #53197)
  * Add -isp option to dpkg-gencontrol (lintian error)
  * Move scm to section interpreters.

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

  * Apply patch from upstream for bug in eval.c. (Picked up from
    comp.lang.scheme)
  * Add Build-Depends on slib, librx1g-dev, libncurses4-dev, libreadlineg2-dev.
  * Up standards version.
  * Correct description: this is an R5RS implementation now
  * Make sure no optimizations are done on m68k. (Closes: #52434)

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

  * New upstream.

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

  * Remove TAGS on clean (cut the diff back down to reasonable size).

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

  * New upstream.
  * move stuff to /usr/share.

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

  * Change scmlit call to ./scmlit call (missed one) (Fixes bugs #37455
    and #35545)
  * Change man file permissions to 644 (fixes lintian warning)

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

  * Removed call to add_final in init_crs.  lendwin doesn't do anything
    and scm was crashing when quit everytime in final_scm.
  * Changed copyright to reflect new source.

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

  * New upstream.
  * Changed (terms) to access "/usr/doc/copyright/GPL".
  * Changed regex to use -lrx

scm (5c3-6) unstable; urgency=low

  * New maintainer.

6 files changed, 142 insertions, 37 deletions

diff --git a/debian/changelog b/debian/changelog
index c94c8fb..981ac53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,74 @@
+scm (5d2-3) unstable frozen; urgency=low
+
+  * Fix libncurses4-dev -> libncurses5-dev build depend (Closes: #58435)
+  * Fix libreadline2-dev -> libreadline4-dev build depend.
+  * Fix license location in copyright file (lintian warning)
+  * Add tetex-bin as a build depend (needs makeinfo) (Closes: #53197)
+  * Add -isp option to dpkg-gencontrol (lintian error)
+  * Move scm to section interpreters.
+
+ -- James LewisMoss <dres@debian.org>  Sun, 12 Mar 2000 09:04:17 -0500
+
+scm (5d2-2) unstable; urgency=low
+
+  * Apply patch from upstream for bug in eval.c. (Picked up from
+    comp.lang.scheme)
+  * Add Build-Depends on slib, librx1g-dev, libncurses4-dev, libreadlineg2-dev.
+  * Up standards version.
+  * Correct description: this is an R5RS implementation now
+  * Make sure no optimizations are done on m68k. (Closes: #52434)
+
+ -- James LewisMoss <dres@debian.org>  Thu, 16 Dec 1999 23:53:15 -0500
+
+scm (5d2-1) unstable; urgency=low
+
+  * New upstream.
+
+ -- James LewisMoss <dres@debian.org>  Mon,  6 Dec 1999 19:30:02 -0500
+
+scm (5d1-2) unstable; urgency=low
+
+  * Remove TAGS on clean (cut the diff back down to reasonable size).
+
+ -- James LewisMoss <dres@debian.org>  Sat, 13 Nov 1999 14:10:10 -0500
+
+scm (5d1-1) unstable; urgency=low
+
+  * New upstream.
+  * move stuff to /usr/share.
+
+ -- James LewisMoss <dres@debian.org>  Sat, 13 Nov 1999 13:26:46 -0500
+
+scm (5d0-3) unstable; urgency=low
+
+  * Change scmlit call to ./scmlit call (missed one) (Fixes bugs #37455
+    and #35545)
+  * Change man file permissions to 644 (fixes lintian warning)
+
+ -- James LewisMoss <dres@debian.org>  Wed, 12 May 1999 22:39:54 -0400
+
+scm (5d0-2) unstable; urgency=low
+
+  * Removed call to add_final in init_crs.  lendwin doesn't do anything
+    and scm was crashing when quit everytime in final_scm.
+  * Changed copyright to reflect new source.
+
+ -- James LewisMoss <dres@debian.org>  Thu, 11 Mar 1999 22:13:19 -0500
+
+scm (5d0-1) unstable; urgency=low
+
+  * New upstream.
+  * Changed (terms) to access "/usr/doc/copyright/GPL".
+  * Changed regex to use -lrx
+
+ -- James LewisMoss <dres@debian.org>  Sun,  7 Mar 1999 12:39:16 -0500
+
+scm (5c3-6) unstable; urgency=low
+
+  * New maintainer.
+
+ -- James LewisMoss <dres@debian.org>  Fri, 26 Feb 1999 00:45:30 -0500
+
 scm (5c3-5) frozen unstable; urgency=low
 
   * debian/rules chmod +x's bld.scm. Fixes #30521.
@@ -58,4 +129,5 @@ scm (4e6-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 9660bb5..adca312 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,13 @@
 Source: scm
-Section: devel
+Section: interpreters
 Priority: optional
-Maintainer:  David N. Welton <davidw@efn.org>
-Standards-Version: 2.5.0.0
+Maintainer:  James LewisMoss <dres@debian.org>
+Standards-Version: 3.1.1
+Build-Depends: slib, librx1g-dev, libncurses5-dev, libreadline4-dev, tetex-bin
 
 Package: scm
 Architecture: any
 Depends: slib, ${shlibs:Depends}
 Description: A Scheme language interpreter.
- Scm conforms to Revised^4 Report on the Algorithmic Language Scheme and
+ 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 6189358..419226e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,10 @@
 This is the Debian GNU/Linux prepackaged version of scm.
 
-This package was put together by Karl Sackett <krs@debian.org>,
-from sources obtained from:
+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/scm5b3.tar.gz
+	ftp://swiss-ftp.ai.mit.edu/archive/scm/scm5d0.tar.gz
 
 For more information see:
 
@@ -12,4 +13,4 @@ For more information see:
 License:
 
 scm is distributed under the GNU General Public License.  See
-/usr/doc/copyright/GPL.gz for details.
+/usr/share/common-licenses/GPL for details.
diff --git a/debian/postinst b/debian/postinst
index f544d8c..aa12961 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,4 +3,10 @@ set -e
 
 install-info --quiet --section "Development" "Development" \
   --description="A Scheme language interpreter" \
-  /usr/info/scm.info.gz
+  /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
diff --git a/debian/prerm b/debian/prerm
new file mode 100644
index 0000000..85fdaab
--- /dev/null
+++ b/debian/prerm
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/scm ]; then
+	rm -f /usr/doc/scm
+fi
+
diff --git a/debian/rules b/debian/rules
index 07e44fa..bc0618f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,9 +12,17 @@ INSTALL =/usr/bin/install
 INSTALL_DIR =$(INSTALL) -d -m 755 -o root -g root
 INSTALL_PROGRAM =$(INSTALL) -m 755 -o root -g root
 INSTALL_DATA =$(INSTALL) -m 644 -o root -g root
-INSTALL_MAN =$(INSTALL) -m 444 -o root -g root
+INSTALL_MAN =$(INSTALL) -m 644 -o root -g root
 
-SCM_OPTIONS = -p linux --compiler-options=-O2 --compiler-options=-g \
+ifeq ($(DEB_BUILD_ARCH), m68k)
+COMPILER_OPTIONS=
+else
+COMPILER_OPTIONS=-O2
+endif
+
+SCM_OPTIONS = -p linux  \
+  --compiler-options=-g \
+  --compiler-options=$(COMPILER_OPTIONS) \
   -F cautious \
   -F bignums \
   -F arrays \
@@ -25,17 +33,18 @@ SCM_OPTIONS = -p linux --compiler-options=-O2 --compiler-options=-g \
   -F generalized-c-arguments \
   -F tick-interrupts \
   -F i/o-extensions \
-  -F curses \
   -F edit-line \
   -F regex \
   -F socket \
   -F posix \
   -F unix \
+  -F curses \
   -F dynamic-linking \
   -F dump \
-  -F heap-can-shrink \
   -F macro
 
+#   -F heap-can-shrink \
+
 NON_LIB_FILES = 'bench.scm|build.scm|example.scm|r4rstest.scm|pi.scm'
 
 #test: stamp-configure
@@ -46,21 +55,27 @@ build:
 	chmod +x bld.scm
 	$(checkdir)
 	cp debian/require.scm.debian require.scm
+ifeq ($(DEB_BUILD_ARCH), m68k)
+	${MAKE} scmlit CFLAGS=-g
+else
 	${MAKE} scmlit
+endif
 	test -e /usr/share/slib || \
     (echo "Must have slib installed for compile" && exit 1)	
 #	SCHEME_LIBRARY_PATH=/usr/share/slib/ ./build.scm ${SCM_OPTIONS} > debian/bld
 	./bld.scm ${SCM_OPTIONS} > debian/bld
 	chmod ug+x debian/bld
 	debian/bld
-	-rm -f debian/bld
-	makeinfo scm.texi -o scm.info
+	#-rm -f debian/bld
+	#makeinfo scm.texi -o scm.info
+	make scm.info
 	texi2html -monolithic scm.texi
 	touch build
 
 clean:
 	$(checkdir)
 	-rm scm.info* scm.html tmp1 tmp2 scmflags.h scmlit
+	-rm -f scm5d0.info
 	-rm require.scm scm
 	make distclean
 	-rm -f build debian/bld
@@ -77,6 +92,7 @@ binary-arch: 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
 
 # binaries
@@ -87,38 +103,39 @@ binary-arch: checkroot build
 	$(INSTALL_DIR) debian/tmp/usr/lib/scm
 	$(INSTALL_DATA) `ls *.scm | egrep -v ${NON_LIB_FILES}` debian/tmp/usr/lib/scm
 	$(INSTALL_DATA) slibcat debian/tmp/usr/lib/scm
+	chmod +x debian/tmp/usr/lib/scm/bld.scm
 
 # man pages
-	$(INSTALL_DIR) debian/tmp/usr/man/man1
-	$(INSTALL_MAN)	scm.1 debian/tmp/usr/man/man1
-	gzip -9vr debian/tmp/usr/man
+	$(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
 
 # documentation
-	$(INSTALL_DIR) debian/tmp/usr/doc/scm
-	$(INSTALL_DATA) debian/changelog debian/tmp/usr/doc/scm/changelog.Debian
-	$(INSTALL_DATA) ChangeLog debian/tmp/usr/doc/scm
-	$(INSTALL_DATA) QUICKREF debian/tmp/usr/doc/scm
-	$(INSTALL_DATA) README debian/tmp/usr/doc/scm
-	gzip -9v debian/tmp/usr/doc/scm/*
-	$(INSTALL_DATA) scm.html debian/tmp/usr/doc/scm
-	$(INSTALL_DATA) debian/copyright debian/tmp/usr/doc/scm
+	$(INSTALL_DIR) debian/tmp/usr/share/doc/scm
+	$(INSTALL_DATA) debian/changelog debian/tmp/usr/share/doc/scm/changelog.Debian
+	$(INSTALL_DATA) ChangeLog debian/tmp/usr/share/doc/scm/changelog
+	$(INSTALL_DATA) QUICKREF debian/tmp/usr/share/doc/scm
+	$(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) debian/copyright debian/tmp/usr/share/doc/scm
 
 # examples
-	$(INSTALL_DIR) debian/tmp/usr/doc/scm/examples
-	$(INSTALL_DATA) r4rstest.scm debian/tmp/usr/doc/scm/examples
-	$(INSTALL_DATA) example.scm debian/tmp/usr/doc/scm/examples
-	$(INSTALL_DATA) pi.scm debian/tmp/usr/doc/scm/examples
-	$(INSTALL_DATA) pi.c debian/tmp/usr/doc/scm/examples
-	$(INSTALL_DATA) bench.scm debian/tmp/usr/doc/scm/examples
-	$(INSTALL_DATA) split.scm debian/tmp/usr/doc/scm/examples
+	$(INSTALL_DIR) debian/tmp/usr/share/doc/scm/examples
+	$(INSTALL_DATA) r4rstest.scm debian/tmp/usr/share/doc/scm/examples
+	$(INSTALL_DATA) example.scm debian/tmp/usr/share/doc/scm/examples
+	$(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) split.scm debian/tmp/usr/share/doc/scm/examples
 
 # info pages
-	$(INSTALL_DIR) debian/tmp/usr/info
-	$(INSTALL_DATA) scm.info* debian/tmp/usr/info
-	gzip -9 debian/tmp/usr/info/*
+	$(INSTALL_DIR) debian/tmp/usr/share/info
+	$(INSTALL_DATA) scm.info* debian/tmp/usr/share/info
+	gzip -9 debian/tmp/usr/share/info/*
 
 	dpkg-shlibdeps scm
-	dpkg-gencontrol
+	dpkg-gencontrol -isp
 	dpkg --build debian/tmp ..
 
 define checkdir