Import Debian changes 3b1-5HEADdebian/3b1-5master

slib (3b1-5) unstable; urgency=medium

  * QA upload.
  * Drop obsolete prerm.
  * Drop obsolete preinst.
  * Switch to minimal dh debian/rules.
  * Tidy up debian/patches a little bit.
  * Add a debian/clean file so that package builds twice in a row.
  * Do not regenerate version.txi just because Makefile was modified.
  * Try to be reproducible by setting PERL_HASH_SEED and using
    an init file for texi2html (inspired by texi2html test suite).

1 files changed, 0 insertions, 154 deletions

diff --git a/debian/patches/debian-changes-3b1-3.1 b/debian/patches/debian-changes-3b1-3.1
deleted file mode 100644
index 27c64a7..0000000
--- a/debian/patches/debian-changes-3b1-3.1
+++ /dev/null
@@ -1,154 +0,0 @@
-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)))
-