aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Bushnell <tb@debian.org>2006-10-20 13:37:25 -0700
committerBryan Newbold <bnewbold@robocracy.org>2017-02-20 00:05:33 -0800
commit6ac4f52537ca366eeeac2c806207ea416b2a4b3d (patch)
tree38249b6a72b111ff58b4a032816d73af9cbd66a9
parent44ed6d53b9dcf6c05887151a25cb1a25e2d1ca08 (diff)
downloadscm-6ac4f52537ca366eeeac2c806207ea416b2a4b3d.tar.gz
scm-6ac4f52537ca366eeeac2c806207ea416b2a4b3d.zip
Import Debian changes 5e2-4debian/5e2-4
scm (5e2-4) unstable; urgency=medium * Medium urgency because this fixes the non-working xgen.scm and compile.scm programs. * debian/control (Standards-Version): Update to 3.7.2. * debian/control (Architecture): Change i386-hurd to hurd-i386. * scm.1 (.TH): Put in section number. * debian/doc-base: Put .gz suffix after info files, since that's how we install them. * debian/rules (binary-arch): Make compile.scm and xgen.scm executable. * xgen.scm (#!): Find /usr/bin/scm in correct place. * debian/control (Build-Depends): Add debhelper. * debian/rules (DH_VERBOSE): New variable; commented out. (checkdir): Delete variable; replace with dh_testdir. (checkroot): Delete target; replace with dh_testroot. (clean): Call dh_testroot. Remove build-stamp first in case something later bombs. Call dh_clean at the end. (binary-indep): Just depend on build and install and do nothing else. (install): New target. Most of the guts come here from binary-arch. Call debhelper stuff at the front. Install into debian/scm instead of debian/tmp. (binary-arch): Use debhelper commands to build the package. (.PHONY): Add install. * debian/compat: New file (level 5). * debian/postinst: Add #DEBHELPER# token. * debian/prerm: Add #DEBHELPER# token.
-rw-r--r--Xlibscm.html6
-rw-r--r--debian/changelog35
-rw-r--r--debian/compat1
-rw-r--r--debian/control6
-rw-r--r--debian/doc-base4
-rw-r--r--debian/postinst2
-rw-r--r--debian/prerm2
-rwxr-xr-xdebian/rules155
-rw-r--r--scm.12
-rwxr-xr-xxgen.scm2
10 files changed, 142 insertions, 73 deletions
diff --git a/Xlibscm.html b/Xlibscm.html
index 2b1dd0c..a33b38b 100644
--- a/Xlibscm.html
+++ b/Xlibscm.html
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/loose.dtd">
<html>
-<!-- Created on April, 26 2006 by texi2html 1.76 -->
+<!-- Created on September, 12 2006 by texi2html 1.76 -->
<!--
Written by: Lionel Cons <Lionel.Cons@cern.ch> (original author)
Karl Berry <karl@freefriends.org>
@@ -3215,7 +3215,7 @@ X-event:count represents the number of keycodes altered.
</tr></table>
<h1>About This Document</h1>
<p>
- This document was generated by <em>Thomas Bushnell BSG</em> on <em>April, 26 2006</em> using <a href="http://texi2html.cvshome.org/"><em>texi2html 1.76</em></a>.
+ This document was generated by <em>Thomas Bushnell BSG</em> on <em>September, 12 2006</em> using <a href="http://texi2html.cvshome.org/"><em>texi2html 1.76</em></a>.
</p>
<p>
The buttons in the navigation panels have the following meaning:
@@ -3317,7 +3317,7 @@ X-event:count represents the number of keycodes altered.
<hr size="1">
<p>
<font size="-1">
- This document was generated by <em>Thomas Bushnell BSG</em> on <em>April, 26 2006</em> using <a href="http://texi2html.cvshome.org/"><em>texi2html 1.76</em></a>.
+ This document was generated by <em>Thomas Bushnell BSG</em> on <em>September, 12 2006</em> using <a href="http://texi2html.cvshome.org/"><em>texi2html 1.76</em></a>.
</font>
<br>
diff --git a/debian/changelog b/debian/changelog
index 0f0b2f9..64a4b7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,38 @@
+scm (5e2-4) unstable; urgency=medium
+
+ * Medium urgency because this fixes the non-working xgen.scm and
+ compile.scm programs.
+
+ * debian/control (Standards-Version): Update to 3.7.2.
+
+ * debian/control (Architecture): Change i386-hurd to hurd-i386.
+
+ * scm.1 (.TH): Put in section number.
+
+ * debian/doc-base: Put .gz suffix after info files, since that's how we
+ install them.
+
+ * debian/rules (binary-arch): Make compile.scm and xgen.scm executable.
+ * xgen.scm (#!): Find /usr/bin/scm in correct place.
+
+ * debian/control (Build-Depends): Add debhelper.
+ * debian/rules (DH_VERBOSE): New variable; commented out.
+ (checkdir): Delete variable; replace with dh_testdir.
+ (checkroot): Delete target; replace with dh_testroot.
+ (clean): Call dh_testroot. Remove build-stamp first in case something
+ later bombs. Call dh_clean at the end.
+ (binary-indep): Just depend on build and install and do nothing else.
+ (install): New target. Most of the guts come here from binary-arch.
+ Call debhelper stuff at the front.
+ Install into debian/scm instead of debian/tmp.
+ (binary-arch): Use debhelper commands to build the package.
+ (.PHONY): Add install.
+ * debian/compat: New file (level 5).
+ * debian/postinst: Add #DEBHELPER# token.
+ * debian/prerm: Add #DEBHELPER# token.
+
+ -- Thomas Bushnell, BSG <tb@debian.org> Fri, 20 Oct 2006 13:37:25 -0700
+
scm (5e2-3) unstable; urgency=low
* debian/control (Architecture): Remove s390, officially unsupported by
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
index 2836518..ab2978d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,11 @@ Source: scm
Section: interpreters
Priority: optional
Maintainer: Thomas Bushnell, BSG <tb@debian.org>
-Standards-Version: 3.1.1
-Build-Depends: slib (>> 3a3), libncurses5-dev, libreadline5-dev, texi2html, texinfo, libx11-dev
+Standards-Version: 3.7.2
+Build-Depends: slib (>> 3a3), libncurses5-dev, libreadline5-dev, texi2html, texinfo, libx11-dev, debhelper (>= 5)
Package: scm
-Architecture: alpha amd64 arm hppa i386 i386-hurd m68k mips mipsel powerpc ppc64 sparc
+Architecture: alpha amd64 arm hppa i386 hurd-i386 m68k mips mipsel powerpc ppc64 sparc
Section: interpreters
Priority: optional
Depends: slib, ${shlibs:Depends}
diff --git a/debian/doc-base b/debian/doc-base
index 1e9e5f3..c3c3a7e 100644
--- a/debian/doc-base
+++ b/debian/doc-base
@@ -5,10 +5,10 @@ Abstract: This manual describes the scheme interpreter scm.
Section: Apps/Programming
Format: info
-Files: /usr/share/info/scm.info
+Files: /usr/share/info/scm.info.gz
Format: info
-Files: /usr/share/info/Xlibscm.info
+Files: /usr/share/info/Xlibscm.info.gz
Format: HTML
Index: /usr/share/doc/scm/scm.html
diff --git a/debian/postinst b/debian/postinst
index 49c2e86..aa235c4 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -23,3 +23,5 @@ rm -f /usr/lib/scm/slibcat
if [ -e /usr/lib/scm/slibcat ] ; then
chmod 644 /usr/lib/scm/slibcat
fi
+
+#DEBHELPER#
diff --git a/debian/prerm b/debian/prerm
index dbc91e8..37960c3 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -14,3 +14,5 @@ if [ "$1" = remove -o "$1" = upgrade ]; then
fi
install-info --quiet --remove /usr/share/info/scm.info.gz
+
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 5049713..b3ce1d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,14 +52,14 @@ SCM_OPTIONS = -p linux \
#export SCHEME_LIBRARY_PATH
NON_LIB_FILES = 'bench.scm|build.scm|example.scm|r4rstest.scm|pi.scm|grtest.scm'
-#test: stamp-configure
-# $(checkdir)
-# make checklit
+# Uncomment this to turn on verbose mode
+#export DH_VERBOSE=1
+
build: build-stamp
build-stamp:
chmod +x build
- $(checkdir)
+ dh_testdir
cp debian/require.scm.debian require.scm
ifeq ($(DEB_BUILD_ARCH), m68k)
${MAKE} scmlit CFLAGS="-g -Wall"
@@ -78,7 +78,10 @@ endif
touch build-stamp
clean:
- $(checkdir)
+ dh_testdir
+ dh_testroot
+ -rm -f build-stamp
+
-rm -f scm.info* scm.html tmp1 tmp2 scmflags.h scmlit
-rm -f Xlibscm.info*
-rm -f features.txi platform.txi
@@ -88,81 +91,107 @@ clean:
-rm -f srcdir.mk
-rm -f debian/bld
-rm -rf *~ debian/*~ debian/tmp* debian/files debian/substvars
- -rm -f build-stamp
-binary-indep: checkroot
- $(checkdir)
+ dh_clean
+
+binary-indep: build install
+# We have nothing to do by default
-binary-arch: checkroot build
- $(checkdir)
- -rm -rf debian/tmp*
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
-# debian/tmp
- $(INSTALL_DIR) debian/tmp
- $(INSTALL_DIR) debian/tmp/DEBIAN
- $(INSTALL_PROGRAM) debian/postinst debian/tmp/DEBIAN
- $(INSTALL_PROGRAM) debian/prerm debian/tmp/DEBIAN
+ -rm -rf debian/scm
+
+# debian/scm
+ $(INSTALL_DIR) debian/scm
+ $(INSTALL_DIR) debian/scm/DEBIAN
+ $(INSTALL_PROGRAM) debian/postinst debian/scm/DEBIAN
+ $(INSTALL_PROGRAM) debian/prerm debian/scm/DEBIAN
# binaries
- $(INSTALL_DIR) debian/tmp/usr/bin
- $(INSTALL_PROGRAM) -s scm debian/tmp/usr/bin
+ $(INSTALL_DIR) debian/scm/usr/bin
+ $(INSTALL_PROGRAM) -s scm debian/scm/usr/bin
# library
- $(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
+ $(INSTALL_DIR) debian/scm/usr/lib/scm
+ $(INSTALL_DATA) `ls *.scm | egrep -v ${NON_LIB_FILES}` debian/scm/usr/lib/scm
+ $(INSTALL_DATA) slibcat debian/scm/usr/lib/scm
+ chmod +x debian/scm/usr/lib/scm/compile.scm
+ chmod +x debian/scm/usr/lib/scm/xgen.scm
# headers
- $(INSTALL_DIR) debian/tmp/usr/include/scm
- $(INSTALL_DATA) *.h debian/tmp/usr/include/scm
+ $(INSTALL_DIR) debian/scm/usr/include/scm
+ $(INSTALL_DATA) *.h debian/scm/usr/include/scm
# 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 || true
+ $(INSTALL_DIR) debian/scm/usr/share/man/man1
+ $(INSTALL_MAN) scm.1 debian/scm/usr/share/man/man1
+ gzip -9vr debian/scm/usr/share/man || true
# documentation
- $(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) 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
- $(INSTALL_DATA) debian/doc-base debian/tmp/usr/share/doc-base/scm
+ $(INSTALL_DIR) debian/scm/usr/share/doc/scm
+ $(INSTALL_DATA) debian/changelog debian/scm/usr/share/doc/scm/changelog.Debian
+ $(INSTALL_DATA) ChangeLog debian/scm/usr/share/doc/scm/changelog
+ $(INSTALL_DATA) QUICKREF debian/scm/usr/share/doc/scm
+ $(INSTALL_DATA) README debian/scm/usr/share/doc/scm
+ gzip -9v debian/scm/usr/share/doc/scm/*
+ $(INSTALL_DATA) scm.html debian/scm/usr/share/doc/scm
+ $(INSTALL_DATA) Xlibscm.html debian/scm/usr/share/doc/scm
+ $(INSTALL_DATA) debian/copyright debian/scm/usr/share/doc/scm
+
+ $(INSTALL_DIR) debian/scm/usr/share/doc-base
+ $(INSTALL_DATA) debian/doc-base debian/scm/usr/share/doc-base/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
-# $(INSTALL_DATA) grtest.scm debian/tmp/usr/share/doc/scm/examples
+ $(INSTALL_DIR) debian/scm/usr/share/doc/scm/examples
+ $(INSTALL_DATA) r4rstest.scm debian/scm/usr/share/doc/scm/examples
+ $(INSTALL_DATA) example.scm debian/scm/usr/share/doc/scm/examples
+ $(INSTALL_DATA) pi.scm debian/scm/usr/share/doc/scm/examples
+ $(INSTALL_DATA) pi.c debian/scm/usr/share/doc/scm/examples
+ $(INSTALL_DATA) bench.scm debian/scm/usr/share/doc/scm/examples
+ $(INSTALL_DATA) split.scm debian/scm/usr/share/doc/scm/examples
+# $(INSTALL_DATA) grtest.scm debian/scm/usr/share/doc/scm/examples
# 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
- dpkg-gencontrol -isp
- dpkg --build debian/tmp ..
-
-define checkdir
- test -f scm.h -a -f debian/rules
-endef
+ $(INSTALL_DIR) debian/scm/usr/share/info
+ $(INSTALL_DATA) scm.info* debian/scm/usr/share/info
+ $(INSTALL_DATA) Xlibscm.info* debian/scm/usr/share/info
+ gzip -9 debian/scm/usr/share/info/*
+
+binary-arch: build
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ dh_installexamples
+# dh_install
+# dh_installmenu
+# dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installcatalogs
+# dh_installpam
+# dh_installmime
+# dh_installcron
+# dh_installinfo
+# dh_uncodumented
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+# dh_perl
+# dh_python
+# dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
binary: binary-indep binary-arch
-checkroot:
- $(checkdir)
- test root = "`whoami`"
-
-.PHONY: build clean binary binary-arch binary-indep
+.PHONY: build clean binary binary-arch binary-indep install
diff --git a/scm.1 b/scm.1
index 2091712..4c78bba 100644
--- a/scm.1
+++ b/scm.1
@@ -1,5 +1,5 @@
.\" dummy line
-.TH SCM "Jan 4 2000"
+.TH SCM 1 "Jan 4 2000"
.UC 4
.SH NAME
scm \- a Scheme Language Interpreter
diff --git a/xgen.scm b/xgen.scm
index 11071a4..0655c9c 100755
--- a/xgen.scm
+++ b/xgen.scm
@@ -1,4 +1,4 @@
-#! /usr/local/bin/scm \ %0 %*
+#! /usr/bin/scm \ %0 %*
- !#
;; Copyright (C) 1991-2000 Free Software Foundation, Inc.
;;