From 61af55884cfcb2ac70f42a9fc8dc68b3c343b402 Mon Sep 17 00:00:00 2001 From: Jari Aalto Date: Wed, 5 May 2010 03:13:42 +0300 Subject: Import Debian changes 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) ] * debian/rules - (build): Rewrite make calls. - (binary-indep:): install *.html not slib/*.html to fix. It is useless to specify htmllib (FTBFS; Closes: #552911). --- debian/patches/debian-changes-3b1-3.1 | 154 ++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 155 insertions(+) create mode 100644 debian/patches/debian-changes-3b1-3.1 create mode 100644 debian/patches/series (limited to 'debian/patches') 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) ] + * 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 +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: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Forwarded: +Reviewed-By: +Last-Update: + +--- 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{}. + @end table + ++@c the following paragraph added by tb (Thomas Bushnell, BSG) ++@noindent ++Note that file names indicated as @i{} 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 -- cgit v1.2.3