aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJari Aalto <jari.aalto@cante.net>2010-05-05 03:13:42 +0300
committerBryan Newbold <bnewbold@robocracy.org>2017-02-20 00:05:43 -0800
commit61af55884cfcb2ac70f42a9fc8dc68b3c343b402 (patch)
tree7159ecad56e23911f4c869d2f2e076c382378157
parent3f111dfa0c6ef68339f1a5086342a53a66a4c57a (diff)
downloadslib-61af55884cfcb2ac70f42a9fc8dc68b3c343b402.zip
slib-61af55884cfcb2ac70f42a9fc8dc68b3c343b402.tar.gz
Import Debian changes 3b1-3.1debian/3b1-3.1
slib (3b1-3.1) unstable; urgency=low [ Jari Aalto ] * Non-maintainer upload. - Move to packaging format "3.0 (quilt)". * debian/compat - Update to 7. * debian/control - (Build-Depends-Indep): Update to debhelper 7.1. - (Depends): add ${misc:Depends}. - (Homepage): New field. - (Standards-Version): update to 3.8.4. + slib - (Depends): add ${misc:Depends}, install-info. - (Priority): remove inherited field. - (Section): remove inherited field. * debian/copyright - Update "more information" URL. * debian/doc-base - (Section): Remove obsolete top-level "Apps/". * debian/prerm - Remove path component from commands. - Remove obsolete install-docs, install-info commands. * debian/postinst - Remove obsolete install-docs, install-info commands. - Remove path component from commands. * debian/source/format - New file. * debian/watch - New file. [ Hideki Yamane (Debian-JP) <henrich@debian.or.jp> ] * debian/rules - (build): Rewrite make calls. - (binary-indep:): install *.html not slib/*.html to fix. It is useless to specify htmllib (FTBFS; Closes: #552911).
-rw-r--r--Makefile12
-rw-r--r--debian/changelog99
-rw-r--r--debian/compat2
-rw-r--r--debian/control8
-rw-r--r--debian/copyright2
-rw-r--r--debian/doc-base2
-rw-r--r--debian/patches/debian-changes-3b1-3.1154
-rw-r--r--debian/patches/series1
-rwxr-xr-x[-rw-r--r--]debian/postinst25
-rwxr-xr-x[-rw-r--r--]debian/preinst1
-rwxr-xr-x[-rw-r--r--]debian/prerm9
-rwxr-xr-xdebian/rules12
-rw-r--r--debian/slib.debhelper.log6
-rw-r--r--debian/source/format1
-rw-r--r--debian/watch2
-rw-r--r--guile.init23
-rw-r--r--slib.12
-rwxr-xr-xslib.sh2
-rw-r--r--slib.texi6
19 files changed, 273 insertions, 96 deletions
diff --git a/Makefile b/Makefile
index 1da2d5f..8c480e8 100644
--- a/Makefile
+++ b/Makefile
@@ -239,14 +239,14 @@ xpdf: $(htmldir)slib.pdf
xpdf $(htmldir)slib.pdf
TEXI2HTML = /usr/local/bin/texi2html -split -verbose
-$(htmldir)slib_toc.html: version.txi slib.texi $(txifiles) $(texifiles)
+slib_toc.html: version.txi slib.texi $(txifiles) $(texifiles)
${TEXI2HTML} slib.texi
html: $(htmldir)slib_toc.html
-#$(htmldir)slib_toc.html: slib_toc.html Makefile
-# -rm -f slib_stoc.html
-# if [ -f $(PREVDOCS)slib_toc.html ]; \
-# then hitch $(PREVDOCS)slib_\*.html slib_\*.html $(htmldir); \
-#p else cp slib_*.html $(htmldir);fi
+$(htmldir)slib_toc.html: slib_toc.html Makefile
+ -rm -f slib_stoc.html
+ if [ -f $(PREVDOCS)slib_toc.html ]; \
+ then hitch $(PREVDOCS)slib_\*.html slib_\*.html $(htmldir); \
+ else cp slib_*.html $(htmldir);fi
slib-$(VERSION).info: version.txi slib.texi $(txifiles) $(texifiles)
makeinfo slib.texi --no-warn --no-split -o slib.info
diff --git a/debian/changelog b/debian/changelog
index 4b34a96..6e15e00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,48 @@
+slib (3b1-3.1) unstable; urgency=low
+
+ [ Jari Aalto ]
+ * Non-maintainer upload.
+ - Move to packaging format "3.0 (quilt)".
+ * debian/compat
+ - Update to 7.
+ * debian/control
+ - (Build-Depends-Indep): Update to debhelper 7.1.
+ - (Depends): add ${misc:Depends}.
+ - (Homepage): New field.
+ - (Standards-Version): update to 3.8.4.
+ + slib
+ - (Depends): add ${misc:Depends}, install-info.
+ - (Priority): remove inherited field.
+ - (Section): remove inherited field.
+ * debian/copyright
+ - Update "more information" URL.
+ * debian/doc-base
+ - (Section): Remove obsolete top-level "Apps/".
+ * debian/prerm
+ - Remove path component from commands.
+ - Remove obsolete install-docs, install-info commands.
+ * debian/postinst
+ - Remove obsolete install-docs, install-info commands.
+ - Remove path component from commands.
+ * debian/source/format
+ - New file.
+ * debian/watch
+ - New file.
+
+ [ Hideki Yamane (Debian-JP) <henrich@debian.or.jp> ]
+ * debian/rules
+ - (build): Rewrite make calls.
+ - (binary-indep:): install *.html not slib/*.html to fix. It is
+ useless to specify htmllib (FTBFS; Closes: #552911).
+
+ -- Jari Aalto <jari.aalto@cante.net> Wed, 05 May 2010 03:13:42 +0300
+
slib (3b1-3) unstable; urgency=low
* slib.sh: Specify #!/bin/bash. (Closes: #465359)
-
+
* slib.1: Put title *before* section in TH directive.
-
+
* debian/rules (binary-indep): Call dh_md5sums toward the end.
* debian/control (Build-Depends-Indep): Require debhelper version 5.
* debian/compat: New file (level 5).
@@ -39,27 +78,27 @@ slib (3a5-3) unstable; urgency=low
* debian/rules (binary-arch): Don't do anything here. Fixes lintian
warning binary-arch-rules-but-pkg-is-arch-indep.
-
+
* debian/control (Standards-Version): Update to 3.7.3. No changes needed.
-
+
* slib.sh: Specify #!/bin/sh.
-
+
* debian/slib.lintian-overrides: New file. Don't complain about the
usr/share/slib/init symlink.
* debian/rules (binary-indep): Install slib.lintian-overrides as
usr/share/lintian/overrides/slib in the final package.
-
+
-- Thomas Bushnell, BSG <tb@debian.org> Mon, 14 Jan 2008 16:41:39 -0500
slib (3a5-2) unstable; urgency=low
* debian/rules (binary-indep): init subdir symlink should point to ".",
not "..". (Closes: #458172).
-
+
* debian/preinst: New file. Delete /usr/share/slib/init if it's a directory.
* debian/rules (binary-indep): Install preinst into the right place.
(Closes: #458181).
-
+
* guile.init: Use old method of finding implementation-vicinity.
-- Thomas Bushnell, BSG <tb@debian.org> Sat, 29 Dec 2007 10:18:27 -0800
@@ -67,15 +106,15 @@ slib (3a5-2) unstable; urgency=low
slib (3a5-1) unstable; urgency=low
* New upstream release.
-
+
* slib.texi (Library Catalogs): Repeat change from 3a3-3.
-
+
* Makefile: Repeat $(htmldir)slib_toc.html changes from 3a2-1.
-
+
* guile.init: (library-vicinity): Repeat change from 3a4-2.
-
+
* debian/rules (binary-indep): Don't hide .init files in a separate
- subdirectory, thus conforming better to the usual slib practice. Put a
+ subdirectory, thus conforming better to the usual slib practice. Put a
symlink in place to ease transitions. (Closes: #407370).
-- Thomas Bushnell, BSG <tb@debian.org> Fri, 28 Dec 2007 16:25:32 -0800
@@ -98,47 +137,47 @@ slib (3a4-3) unstable; urgency=high
-- Thomas Bushnell, BSG <tb@debian.org> Wed, 1 Nov 2006 21:54:30 -0800
slib (3a4-2) unstable; urgency=low
-
+
* guile.init (library-vicinity): Set default location of slib to
/usr/share/slib instead of /usr/lib/slib.
* RScheme.init (library-vicinity): Likewise.
-
+
* require.scm: Work around the fact that scm versions < 5e3 set
*features* but not slib:features.
-
+
-- Thomas Bushnell, BSG <tb@debian.org> Tue, 24 Oct 2006 17:45:55 -0700
slib (3a4-1) unstable; urgency=low
* New upstream release.
-
+
* slib.texi (Library Catalogs): Repeat change from 3a3-3.
-
+
* Makefile: Repeat $(htmldir)slib_toc.html changes from 3a2-1.
-
+
-- Thomas Bushnell, BSG <tb@debian.org> Mon, 23 Oct 2006 23:55:08 -0700
slib (3a3-4) unstable; urgency=low
* debian/control (Standards-Version): Update to 3.7.2.
-
+
* debian/copyright: Fix spelling error.
-
+
-- Thomas Bushnell, BSG <tb@debian.org> Tue, 3 Oct 2006 00:38:06 -0700
slib (3a3-3) unstable; urgency=low
* slib.texi (Library Catalogs): Mention that a suffix (such as ".scm")
may be appended to the filename on some systems. (Closes: #147477)
-
- * postinst, prerm: Just know that install-docs is in /usr/sbin.
+
+ * postinst, prerm: Just know that install-docs is in /usr/sbin.
(Closes: #293047)
-
+
* debian/rules (binary-indep): Install slib.sh as /usr/bin/slib program.
(Closes: #301437)
-
+
* getopt.scm (*argv*): Comment out declaration. (Closes: #248781)
-
+
-- Thomas Bushnell, BSG <tb@debian.org> Mon, 11 Sep 2006 22:48:39 -0700
slib (3a3-2) unstable; urgency=low
@@ -154,9 +193,9 @@ slib (3a3-1) unstable; urgency=low
misfeature at this point, and stick to upstream's version, unless this
causes actual difficulties.
* Makefile: Repeat $(htmldir)slib_toc.html changes from 3a2-1.
-
+
* debian/postinst: Fix typos in comments. (Closes: #337571)
-
+
-- Thomas Bushnell, BSG <tb@debian.org> Wed, 26 Apr 2006 23:08:39 -0700
slib (3a2-5) unstable; urgency=low
@@ -184,7 +223,7 @@ slib (3a2-3) unstable; urgency=low
* Brought all source files up-to-date with upstream development snapshot.
Repeat changes from version 3a2-1 in Makefile.
-
+
-- Thomas Bushnell, BSG <tb@debian.org> Sun, 4 Dec 2005 20:03:34 -0800
slib (3a2-2) unstable; urgency=low
@@ -206,7 +245,7 @@ slib (3a2-1) unstable; urgency=low
* Makefile: Comment out old rule for $(htmldir)slib_toc.html. Instead,
specify directly that the texi2html invocation produces that file.
* debian/rules (binary-indep): Find web files in slib subdir.
-
+
* debian/control (Build-Depends-Indep): Go back to using scm.
-- Thomas Bushnell, BSG <tb@debian.org> Wed, 2 Nov 2005 14:55:21 -0800
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 80e3911..488d306 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: slib
Section: devel
Priority: optional
Maintainer: Thomas Bushnell, BSG <tb@debian.org>
-Build-Depends-Indep: scm, texi2html, texinfo, debhelper (>= 5)
-Standards-Version: 3.7.3
+Build-Depends-Indep: scm, texi2html, texinfo, debhelper (>= 7.1)
+Standards-Version: 3.8.4
+Homepage: http://people.csail.mit.edu/jaffer/SLIB.html
Package: slib
-Section: devel
-Priority: optional
Architecture: all
+Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info
Conflicts: libguile9 (<= 1:1.4-26), guile-1.6-libs (<= 1.6.7-1.1), scm (<< 5e3)
Description: Portable Scheme library
SLIB is a portable scheme library meant to provide compatibility and
diff --git a/debian/copyright b/debian/copyright
index bd5b496..fcded5e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,7 @@ from:
For more information see:
- http://www-swiss.ai.mit.edu/~jaffer/SLIB.html
+ http://people.csail.mit.edu/jaffer/SLIB.html
Following are a list of source files followed by the copyright that
applies to them.
diff --git a/debian/doc-base b/debian/doc-base
index dc4d265..56c73aa 100644
--- a/debian/doc-base
+++ b/debian/doc-base
@@ -3,7 +3,7 @@ Title: slib Scheme library documentation
Author: Aubrey Jaffer
Abstract: This manual describes the facilities and functions
provided by the slib scheme library.
-Section: Apps/Programming
+Section: Programming
Format: HTML
Index: /usr/share/doc/slib/slib_toc.html
diff --git a/debian/patches/debian-changes-3b1-3.1 b/debian/patches/debian-changes-3b1-3.1
new file mode 100644
index 0000000..27c64a7
--- /dev/null
+++ b/debian/patches/debian-changes-3b1-3.1
@@ -0,0 +1,154 @@
+Description: Upstream changes introduced in version 3b1-3.1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ slib (3b1-3.1) unstable; urgency=low
+ .
+ [ Jari Aalto ]
+ * Non-maintainer upload.
+ - Move to packaging format "3.0 (quilt)".
+ * debian/compat
+ - Update to 7.
+ * debian/control
+ - (Build-Depends-Indep): Update to debhelper 7.1.
+ - (Depends): add ${misc:Depends}.
+ - (Homepage): New field.
+ - (Standards-Version): update to 3.8.4.
+ + slib
+ - (Depends): add ${misc:Depends}, install-info.
+ - (Priority): remove inherited field.
+ - (Section): remove inherited field.
+ * debian/copyright
+ - Update "more information" URL.
+ * debian/doc-base
+ - (Section): Remove obsolete top-level "Apps/".
+ * debian/prerm
+ - Remove path component from commands.
+ - Remove obsolete install-docs, install-info commands.
+ * debian/postinst
+ - Remove obsolete install-docs, install-info commands.
+ - Remove path component from commands.
+ * debian/source/format
+ - New file.
+ * debian/watch
+ - New file.
+ .
+ [ Hideki Yamane (Debian-JP) <henrich@debian.or.jp> ]
+ * debian/rules
+ - (build): Rewrite make calls.
+ - (binary-indep:): install *.html not slib/*.html to fix. It is
+ useless to specify htmllib (FTBFS; Closes: #552911).
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Jari Aalto <jari.aalto@cante.net>
+Bug-Debian: http://bugs.debian.org/552911
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- slib-3b1.orig/slib.1
++++ slib-3b1/slib.1
+@@ -1,5 +1,5 @@
+ .\" dummy line
+-.TH SLIB "Dec 20 2007"
++.TH SLIB 1 "Dec 20 2007"
+ .UC 4
+ .SH NAME
+ SLIB \- Scheme Library
+--- slib-3b1.orig/slib.sh
++++ slib-3b1/slib.sh
+@@ -1,4 +1,4 @@
+-
++#!/bin/bash
+ ##"slib" script; Find a Scheme implementation and initialize SLIB in it.
+ #Copyright (C) 2003, 2004 Aubrey Jaffer
+ #
+--- slib-3b1.orig/slib.texi
++++ slib-3b1/slib.texi
+@@ -335,6 +335,12 @@ appropriate for the implementation.
+ @code{macro:load}s the Scheme source file @i{<path>}.
+ @end table
+
++@c the following paragraph added by tb (Thomas Bushnell, BSG)
++@noindent
++Note that file names indicated as @i{<path>} may have ``.scm'' or
++another suffix appended to them, depending on the specific Scheme
++system you are using.
++
+
+ @node Catalog Creation, Catalog Vicinities, Library Catalogs, The Library System
+ @section Catalog Creation
+--- slib-3b1.orig/Makefile
++++ slib-3b1/Makefile
+@@ -239,14 +239,14 @@ xpdf: $(htmldir)slib.pdf
+ xpdf $(htmldir)slib.pdf
+
+ TEXI2HTML = /usr/local/bin/texi2html -split -verbose
+-slib_toc.html: version.txi slib.texi $(txifiles) $(texifiles)
++$(htmldir)slib_toc.html: version.txi slib.texi $(txifiles) $(texifiles)
+ ${TEXI2HTML} slib.texi
+ html: $(htmldir)slib_toc.html
+-$(htmldir)slib_toc.html: slib_toc.html Makefile
+- -rm -f slib_stoc.html
+- if [ -f $(PREVDOCS)slib_toc.html ]; \
+- then hitch $(PREVDOCS)slib_\*.html slib_\*.html $(htmldir); \
+- else cp slib_*.html $(htmldir);fi
++#$(htmldir)slib_toc.html: slib_toc.html Makefile
++# -rm -f slib_stoc.html
++# if [ -f $(PREVDOCS)slib_toc.html ]; \
++# then hitch $(PREVDOCS)slib_\*.html slib_\*.html $(htmldir); \
++#p else cp slib_*.html $(htmldir);fi
+
+ slib-$(VERSION).info: version.txi slib.texi $(txifiles) $(texifiles)
+ makeinfo slib.texi --no-warn --no-split -o slib.info
+--- slib-3b1.orig/guile.init
++++ slib-3b1/guile.init
+@@ -43,17 +43,17 @@
+ ;;; (implementation-vicinity) should be defined to be the pathname of
+ ;;; the directory where any auxillary files to your Scheme
+ ;;; implementation reside.
+-;; (define implementation-vicinity
+-;; (let* ((path (or (%search-load-path "ice-9/q.scm")
+-;; (error "Could not find ice-9/q.scm in " %load-path)))
+-;; (vic (substring path 0 (- (string-length path) 11))))
+-;; (lambda () vic)))
++(define implementation-vicinity
++ (let* ((path (or (%search-load-path "ice-9/q.scm")
++ (error "Could not find ice-9/q.scm in " %load-path)))
++ (vic (substring path 0 (- (string-length path) 11))))
++ (lambda () vic)))
+ ;;
+ ;;; Rob Browning says %site-dir exists since Guile-1.6
+-(define implementation-vicinity
+- (cond ((and (defined? 'getenv) (getenv "GUILE_IMPLEMENTATION_PATH"))
+- => (lambda (path) (lambda () path)))
+- (else %site-dir)))
++;;(define implementation-vicinity
++;; (cond ((and (defined? 'getenv) (getenv "GUILE_IMPLEMENTATION_PATH"))
++;; => (lambda (path) (lambda () path)))
++;; (else %site-dir)))
+
+ ;;; (library-vicinity) should be defined to be the pathname of the
+ ;;; directory where files of Scheme library functions reside.
+@@ -68,7 +68,10 @@
+ (and path (substring path 0 (- (string-length path) 10))))
+ ;; Use this path if your scheme does not support GETENV
+ ;; or if SCHEME_LIBRARY_PATH is not set.
+- "/usr/lib/slib/"
++;; Changed from /usr/lib/slib to /usr/share/slib by tb@debian.org for
++;; Debian packaging.
++;; "/usr/lib/slib/"
++ "/usr/share/slib/"
+ (in-vicinity (implementation-vicinity) "slib/"))))
+ (lambda () library-path)))
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4240963
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+debian-changes-3b1-3.1
diff --git a/debian/postinst b/debian/postinst
index ea573b7..b88e923 100644..100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,23 +1,22 @@
#!/bin/sh
-set -e
-install-info --quiet --section "The Algorithmic Language Scheme" \
- "The Algorithmic Language Scheme" \
- --description="The SLIB portable Scheme library" \
- /usr/share/info/slib.info.gz
+set -e
# OK. This is bad because it really should be in the guile config or
# in some emacs-common sort of package. Now we conditionally run it.
# one of these probably shouldn't exist, but don't know which and
# probably should support the older.
+
if [ -x /usr/sbin/guile1.4-slibconfig ] ; then
- echo Running /usr/sbin/guile1.4-slibconfig
- /usr/sbin/guile1.4-slibconfig
+ echo guile1.4-slibconfig
+ guile1.4-slibconfig
fi
if [ -x /usr/bin/guile-1.6 -a -e /usr/share/guile/1.6/slib ] ; then
rm -f /usr/share/guile/1.6/slibcat
- /usr/bin/guile-1.6 -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
+
+ guile-1.6 -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
+
if [ -e /usr/share/guile/1.6/slibcat ] ; then
chmod 644 /usr/share/guile/1.6/slibcat
fi
@@ -25,15 +24,9 @@ fi
if [ -x /usr/bin/scm ] ; then
rm -f /usr/lib/scm/slibcat
- /usr/bin/scm -c "(require 'new-catalog)"
+ scm -c "(require 'new-catalog)"
+
if [ -e /usr/lib/scm/slibcat ] ; then
chmod 644 /usr/lib/scm/slibcat
fi
fi
-
-# doc base support
-if [ "$1" = configure ]; then
- if test -x /usr/sbin/install-docs >/dev/null 2>&1; then
- /usr/sbin/install-docs -i /usr/share/doc-base/slib
- fi
-fi
diff --git a/debian/preinst b/debian/preinst
index 0c06b42..6bcd718 100644..100755
--- a/debian/preinst
+++ b/debian/preinst
@@ -4,6 +4,7 @@ set -e
# Older versions of slib stored init files in a separate subdirectory;
# blow that away so that the symlink can be put in its place.
+
if [ "$1" = "upgrade" -a -d /usr/share/slib/init ]; then
rm -rf /usr/share/slib/init
fi
diff --git a/debian/prerm b/debian/prerm
index 4e94192..c5bfdbd 100644..100755
--- a/debian/prerm
+++ b/debian/prerm
@@ -5,12 +5,3 @@ set -e
if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/slib ]; then
rm -f /usr/doc/slib
fi
-
-# doc base support
-if [ "$1" = remove -o "$1" = upgrade ]; then
- if test -x /usr/sbin/install-docs >/dev/null 2>&1; then
- /usr/sbin/install-docs -r slib
- fi
-fi
-
-install-info --quiet --remove /usr/share/info/slib.info.gz
diff --git a/debian/rules b/debian/rules
index 64b0b29..eb91909 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,16 +17,14 @@ 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
-# Override definitions in upstream Makefile thus:
-prefix = debian/tmp/usr
-htmldir = slib/
TEXI2HTML = texi2html --split chapter --verbose
-makeoverrides = "prefix=$(prefix)" "htmldir=$(htmldir)" "TEXI2HTML=$(TEXI2HTML)"
build:
$(checkdir)
- make $(makeoverrides)
- make html $(makeoverrides)
+ # Run the "default target", whatever it be
+ $(MAKE) TEXI2HTML="$(TEXI2HTML)"
+ # Then run target "html"
+ $(MAKE) TEXI2HTML="$(TEXI2HTML)" html
touch build
clean:
@@ -75,7 +73,7 @@ binary-indep: checkroot build
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_DATA) *.html debian/tmp/usr/share/doc/slib
ln -s . debian/tmp/usr/share/slib/init
$(INSTALL_DATA) *.init debian/tmp/usr/share/slib
diff --git a/debian/slib.debhelper.log b/debian/slib.debhelper.log
new file mode 100644
index 0000000..1f7aa54
--- /dev/null
+++ b/debian/slib.debhelper.log
@@ -0,0 +1,6 @@
+dh_md5sums
+dh_md5sums
+dh_md5sums
+dh_md5sums
+dh_md5sums
+dh_md5sums
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..717068c
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://people.csail.mit.edu/jaffer/SLIB.html .*slib-([\d.]+.*)\.zip
diff --git a/guile.init b/guile.init
index f89f2bf..1b59833 100644
--- a/guile.init
+++ b/guile.init
@@ -43,17 +43,17 @@
;;; (implementation-vicinity) should be defined to be the pathname of
;;; the directory where any auxillary files to your Scheme
;;; implementation reside.
-(define implementation-vicinity
- (let* ((path (or (%search-load-path "ice-9/q.scm")
- (error "Could not find ice-9/q.scm in " %load-path)))
- (vic (substring path 0 (- (string-length path) 11))))
- (lambda () vic)))
+;; (define implementation-vicinity
+;; (let* ((path (or (%search-load-path "ice-9/q.scm")
+;; (error "Could not find ice-9/q.scm in " %load-path)))
+;; (vic (substring path 0 (- (string-length path) 11))))
+;; (lambda () vic)))
;;
;;; Rob Browning says %site-dir exists since Guile-1.6
-;;(define implementation-vicinity
-;; (cond ((and (defined? 'getenv) (getenv "GUILE_IMPLEMENTATION_PATH"))
-;; => (lambda (path) (lambda () path)))
-;; (else %site-dir)))
+(define implementation-vicinity
+ (cond ((and (defined? 'getenv) (getenv "GUILE_IMPLEMENTATION_PATH"))
+ => (lambda (path) (lambda () path)))
+ (else %site-dir)))
;;; (library-vicinity) should be defined to be the pathname of the
;;; directory where files of Scheme library functions reside.
@@ -68,10 +68,7 @@
(and path (substring path 0 (- (string-length path) 10))))
;; Use this path if your scheme does not support GETENV
;; or if SCHEME_LIBRARY_PATH is not set.
-;; Changed from /usr/lib/slib to /usr/share/slib by tb@debian.org for
-;; Debian packaging.
-;; "/usr/lib/slib/"
- "/usr/share/slib/"
+ "/usr/lib/slib/"
(in-vicinity (implementation-vicinity) "slib/"))))
(lambda () library-path)))
diff --git a/slib.1 b/slib.1
index dff6271..70a98f0 100644
--- a/slib.1
+++ b/slib.1
@@ -1,5 +1,5 @@
.\" dummy line
-.TH SLIB 1 "Dec 20 2007"
+.TH SLIB "Dec 20 2007"
.UC 4
.SH NAME
SLIB \- Scheme Library
diff --git a/slib.sh b/slib.sh
index b9f0417..2401d14 100755
--- a/slib.sh
+++ b/slib.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+
##"slib" script; Find a Scheme implementation and initialize SLIB in it.
#Copyright (C) 2003, 2004 Aubrey Jaffer
#
diff --git a/slib.texi b/slib.texi
index cbb2e03..b9d9cd7 100644
--- a/slib.texi
+++ b/slib.texi
@@ -335,12 +335,6 @@ appropriate for the implementation.
@code{macro:load}s the Scheme source file @i{<path>}.
@end table
-@c the following paragraph added by tb (Thomas Bushnell, BSG)
-@noindent
-Note that file names indicated as @i{<path>} may have ``.scm'' or
-another suffix appended to them, depending on the specific Scheme
-system you are using.
-
@node Catalog Creation, Catalog Vicinities, Library Catalogs, The Library System
@section Catalog Creation