aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Newbold <bnewbold@robocracy.org>2017-02-20 00:25:49 -0800
committerBryan Newbold <bnewbold@robocracy.org>2017-03-03 00:39:27 -0800
commitd62f83b350bbe13ff1340ccc9d0ef34787550bc8 (patch)
tree6f8ea2e54cbd5914dd6d7d21eae1c8b0ff7e8bf6
parent21c2685e51dddb5c4f88897f730163b90c3b578e (diff)
downloadscm-d62f83b350bbe13ff1340ccc9d0ef34787550bc8.zip
scm-d62f83b350bbe13ff1340ccc9d0ef34787550bc8.tar.gz
repackage with dh
-rw-r--r--debian/clean18
-rw-r--r--debian/compat2
-rw-r--r--debian/control13
-rw-r--r--debian/libscm-dev.install4
-rwxr-xr-xdebian/rules241
-rw-r--r--debian/scm.doc-base (renamed from debian/doc-base)2
-rw-r--r--debian/scm.doc-base.scm-xlib (renamed from debian/doc-base.scm-xlib)4
-rw-r--r--debian/scm.docs5
-rw-r--r--debian/scm.examples7
-rw-r--r--debian/scm.info2
-rw-r--r--debian/scm.install26
-rw-r--r--debian/scm.manpages1
-rw-r--r--debian/scm.opt.debian21
-rw-r--r--debian/source/format1
-rw-r--r--debian/watch6
15 files changed, 130 insertions, 223 deletions
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..2663fe4
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,18 @@
+require.scm
+scmflags.h
+srcdir.mk
+scmlit
+scm
+tmp1
+tmp2
+tmp3
+newflags.h
+libscm.a
+libscm.opt
+Xlibscm.html
+XlibScm.html
+scm.html
+slibcat
+implcat
+changelog
+*.o
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index abbe29b..ed472d2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,13 @@ Source: scm
Section: interpreters
Priority: optional
Maintainer: Thomas Bushnell, BSG <tb@debian.org>
-Standards-Version: 3.7.3
-Build-Depends: slib (>> 3b1), libncurses5-dev, libreadline-dev, texi2html, texinfo, libx11-dev, debhelper (>= 5), quilt
+Build-Depends: slib (>> 3b1), libncurses5-dev, libreadline-dev, texi2html, texinfo, libx11-dev, debhelper (>= 9)
+Standards-Version: 3.9.8
+Homepage: http://people.csail.mit.edu/jaffer/SCM.html
Package: scm
Architecture: alpha amd64 arm hppa i386 hurd-i386 m68k mips mipsel powerpc ppc64 sparc ia64 armel armeb armhf sh4 kfreebsd-amd64 kfreebsd-i386
-Section: interpreters
-Priority: optional
-Depends: slib (>> 3b1), ${shlibs:Depends}
+Depends: slib (>> 3b1), ${shlibs:Depends}, ${misc:Depends}
Description: A Scheme language interpreter
Scm conforms to Revised^5 Report on the Algorithmic Language Scheme and
the IEEE P1178 specification.
@@ -17,9 +16,7 @@ Description: A Scheme language interpreter
Package: libscm-dev
Architecture: alpha amd64 arm hppa i386 hurd-i386 m68k mips mipsel powerpc ppc64 sparc ia64 armel armeb armhf sh4 kfreebsd-amd64 kfreebsd-i386
Section: libdevel
-Priority: optional
-Depends: scm (= ${binary:Version}), slib (>> 3b1), ${shlibs:Depends}
+Depends: scm (= ${binary:Version}), slib (>> 3b1), ${shlibs:Depends}, ${misc:Depends}
Description: Embeddable library for SCM Scheme language interpreter
This is a static library which provides the functionality of SCM, making it
convenient add scheme functionality to other programs.
-
diff --git a/debian/libscm-dev.install b/debian/libscm-dev.install
new file mode 100644
index 0000000..2a66b37
--- /dev/null
+++ b/debian/libscm-dev.install
@@ -0,0 +1,4 @@
+libscm.a /usr/lib
+scm.h /usr/include
+scmfig.h /usr/include
+scmflags.h /usr/include
diff --git a/debian/rules b/debian/rules
index 792147e..6f8ce46 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,225 +1,44 @@
-#! /usr/bin/make -f
-# -*-Makefile-*-
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
-CC =gcc
-CFLAGS = -g -Wall
-LDFLAGS =
-SHELL =/bin/sh
-srcdir =.
+# see FEATURE AREAS in dpkg-buildflags(1)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-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 644 -o root -g root
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
+# package maintainers to append LDFLAGS
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-ifeq ($(DEB_BUILD_ARCH), m68k)
-COMPILER_OPTIONS=
-else
-COMPILER_OPTIONS=
-endif
+%:
+ dh $@
-ifeq ($(DEB_BUILD_ARCH),ia64)
-PLATFORM=linux-ia64
-else
-PLATFORM=linux
-endif
-
-SCM_OPTIONS = -p $(PLATFORM) \
- --compiler-options="$(COMPILER_OPTIONS)" \
- -F cautious \
- -F bignums \
- -F arrays \
- -F array-for-each \
- -F inexact \
- -F record \
- -F compiled-closure \
- -F generalized-c-arguments \
- -F tick-interrupts \
- -F i/o-extensions \
- -F edit-line \
- -F regex \
- -F socket \
- -F posix \
- -F unix \
- -F curses \
- -F dynamic-linking \
- -F xlib \
- -F dump \
- -F macro \
- -F differ
-
-# -F dump
-# -F turtlegr
-
-# -F heap-can-shrink \
-
-#SCHEME_LIBRARY_PATH=../slib-3a1/
-#export SCHEME_LIBRARY_PATH
-NON_LIB_FILES = 'bench.scm|build.scm|example.scm|r4rstest.scm|pi.scm|grtest.scm'
-
-# Uncomment this to turn on verbose mode
-#export DH_VERBOSE=1
-
-
-build: build-stamp
-build-stamp:
- chmod +x build
+override_dh_testdir:
dh_testdir
- QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
- cp debian/require.scm.debian require.scm
-ifeq ($(DEB_BUILD_ARCH), m68k)
- ${MAKE} scmlit CFLAGS="-g -Wall" ARCH=$(DEB_BUILD_ARCH)
-else
- ${MAKE} scmlit ARCH=$(DEB_BUILD_ARCH)
-endif
test -e /usr/share/slib || \
- (echo "Must have slib installed for compile" && exit 1)
-
-# Main SCM binary.
- ./build ${SCM_OPTIONS} | tee debian/bld
- chmod ug+x debian/bld
- debian/bld
+ (echo "Must have slib installed for compile" && exit 1)
-# SCM library
- ./build -t lib $(SCM_OPTIONS) | tee debian/bld
- chmod ug+x debian/bld
- debian/bld
+override_dh_auto_configure:
+ dh_auto_configure
+ cp debian/require.scm.debian require.scm
+ cp debian/scm.opt.debian libscm.opt
- make scm.info
- make Xlibscm.info
+override_dh_auto_build:
+ make scmlit
+ # Use the same options for both static library and executable
+ ./build -p linux -hsystem -f libscm.opt
+ ./build -p linux -hsystem -f libscm.opt -t lib
texi2html -monolithic scm.texi
texi2html -monolithic Xlibscm.texi
- touch build-stamp
-
-clean:
- 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
- -rm -f *.info
- -rm require.scm scm
- make distclean
- -rm -f srcdir.mk
- -rm -f debian/bld
- -rm -rf libscm.a
- -rm -rf *~ debian/*~ debian/tmp* debian/files debian/substvars
-
- QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
- dh_clean
-binary-indep: build install
-# We have nothing to do by default
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- -rm -rf debian/scm
- -rm -rf debian/libscm-dev
-
-# 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/scm/usr/bin
- $(INSTALL_PROGRAM) scm debian/scm/usr/bin
-
-# library
- $(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/scm/usr/include/scm
-# $(INSTALL_DATA) *.h debian/scm/usr/include/scm
-
-# man pages
- $(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/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
-
-# 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/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/*
-
-# library package
- $(INSTALL_DIR) debian/libscm-dev/usr/lib
- $(INSTALL_DIR) debian/libscm-dev/usr/include
- $(INSTALL_DIR) debian/libscm-dev/usr/share/doc/libscm-dev
- $(INSTALL_DATA) libscm.a debian/libscm-dev/usr/lib
- $(INSTALL_DATA) scm.h debian/libscm-dev/usr/include
- $(INSTALL_DATA) scmfig.h debian/libscm-dev/usr/include
- $(INSTALL_DATA) scmflags.h debian/libscm-dev/usr/include
- $(INSTALL_DATA) debian/changelog debian/libscm-dev/usr/share/doc/libscm-dev/changelog.Debian
- $(INSTALL_DATA) ChangeLog debian/libscm-dev/usr/share/doc/libscm-dev/changelog
- $(INSTALL_DATA) debian/copyright debian/libscm-dev/usr/share/doc/libscm-dev
-
-binary-arch: build install
- 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
+override_dh_auto_test:
+ # skip: inexact tests fail; fixed in later upstream version
-binary: binary-indep binary-arch
+override_dh_strip:
+ dh_strip --no-automatic-dbgsym
-.PHONY: build clean binary binary-arch binary-indep install
+override_dh_auto_install:
+ # skip; files listed explicitly
diff --git a/debian/doc-base b/debian/scm.doc-base
index 489ea81..9db1e60 100644
--- a/debian/doc-base
+++ b/debian/scm.doc-base
@@ -1,6 +1,6 @@
Document: scm
Title: SCM: scheme interpreter
-Author: Aubrey Jaffer
+Author: Aubrey Jaffer
Abstract: This manual describes the scheme interpreter scm.
Section: Apps/Programming
diff --git a/debian/doc-base.scm-xlib b/debian/scm.doc-base.scm-xlib
index c73ba3a..9a22515 100644
--- a/debian/doc-base.scm-xlib
+++ b/debian/scm.doc-base.scm-xlib
@@ -1,7 +1,7 @@
Document: scm-xlib
Title: X Interface for SCM scheme interpreter
-Author: Aubrey Jaffer
-Abstract: This manual describes the X Interface for scheme interpreter SCM.
+Author: Aubrey Jaffer
+Abstract: This manual describes the X Interface for scheme interpreter SCM.
Section: Apps/Programming
Format: info
diff --git a/debian/scm.docs b/debian/scm.docs
new file mode 100644
index 0000000..2d5c258
--- /dev/null
+++ b/debian/scm.docs
@@ -0,0 +1,5 @@
+QUICKREF
+README
+changelog
+Xlibscm.html
+scm.html
diff --git a/debian/scm.examples b/debian/scm.examples
new file mode 100644
index 0000000..8a4777d
--- /dev/null
+++ b/debian/scm.examples
@@ -0,0 +1,7 @@
+r4rstest.scm
+example.scm
+pi.scm
+pi.c
+bench.scm
+split.scm
+#grtest.scm
diff --git a/debian/scm.info b/debian/scm.info
new file mode 100644
index 0000000..97af525
--- /dev/null
+++ b/debian/scm.info
@@ -0,0 +1,2 @@
+scm.info
+Xlibscm.info
diff --git a/debian/scm.install b/debian/scm.install
new file mode 100644
index 0000000..5ee185d
--- /dev/null
+++ b/debian/scm.install
@@ -0,0 +1,26 @@
+scm /usr/bin
+Idiffer.scm /usr/lib/scm
+Iedline.scm /usr/lib/scm
+Init5e5.scm /usr/lib/scm
+Link.scm /usr/lib/scm
+Macexp.scm /usr/lib/scm
+Macro.scm /usr/lib/scm
+Transcen.scm /usr/lib/scm
+Tscript.scm /usr/lib/scm
+compile.scm /usr/lib/scm
+disarm.scm /usr/lib/scm
+hobbit.scm /usr/lib/scm
+keysymdef.scm /usr/lib/scm
+mkimpcat.scm /usr/lib/scm
+require.scm /usr/lib/scm
+requires.scm /usr/lib/scm
+rwb-isam.scm /usr/lib/scm
+scmhob.scm /usr/lib/scm
+split.scm /usr/lib/scm
+syntest1.scm /usr/lib/scm
+syntest2.scm /usr/lib/scm
+wbtab.scm /usr/lib/scm
+xatoms.scm /usr/lib/scm
+xevent.scm /usr/lib/scm
+xgen.scm /usr/lib/scm
+x11.scm /usr/lib/scm
diff --git a/debian/scm.manpages b/debian/scm.manpages
new file mode 100644
index 0000000..fd8d0fa
--- /dev/null
+++ b/debian/scm.manpages
@@ -0,0 +1 @@
+scm.1
diff --git a/debian/scm.opt.debian b/debian/scm.opt.debian
new file mode 100644
index 0000000..bced2c4
--- /dev/null
+++ b/debian/scm.opt.debian
@@ -0,0 +1,21 @@
+-F cautious bignums arrays
+-F array-for-each
+-F inexact
+-F record
+-F compiled-closure
+-F generalized-c-arguments
+-F tick-interrupts
+-F i/o-extensions
+-F edit-line
+-F regex
+-F socket
+-F posix
+-F unix
+-F curses
+-F dynamic-linking
+-F xlib
+-F dump
+-F macro
+-F differ
+#-F turtlegr
+#-F heap-can-shrink
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..d3b8b45
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,6 @@
+# watch control file for uscan
+# See uscan(1) for format
+
+version=4
+
+http://groups.csail.mit.edu/mac/ftpdir/scm/scm-(.*).zip