Import Debian changes 5d2-3debian/5d2-3

scm (5d2-3) unstable frozen; urgency=low

  * Fix libncurses4-dev -> libncurses5-dev build depend (Closes: #58435)
  * Fix libreadline2-dev -> libreadline4-dev build depend.
  * Fix license location in copyright file (lintian warning)
  * Add tetex-bin as a build depend (needs makeinfo) (Closes: #53197)
  * Add -isp option to dpkg-gencontrol (lintian error)
  * Move scm to section interpreters.

scm (5d2-2) unstable; urgency=low

  * Apply patch from upstream for bug in eval.c. (Picked up from
    comp.lang.scheme)
  * Add Build-Depends on slib, librx1g-dev, libncurses4-dev, libreadlineg2-dev.
  * Up standards version.
  * Correct description: this is an R5RS implementation now
  * Make sure no optimizations are done on m68k. (Closes: #52434)

scm (5d2-1) unstable; urgency=low

  * New upstream.

scm (5d1-2) unstable; urgency=low

  * Remove TAGS on clean (cut the diff back down to reasonable size).

scm (5d1-1) unstable; urgency=low

  * New upstream.
  * move stuff to /usr/share.

scm (5d0-3) unstable; urgency=low

  * Change scmlit call to ./scmlit call (missed one) (Fixes bugs #37455
    and #35545)
  * Change man file permissions to 644 (fixes lintian warning)

scm (5d0-2) unstable; urgency=low

  * Removed call to add_final in init_crs.  lendwin doesn't do anything
    and scm was crashing when quit everytime in final_scm.
  * Changed copyright to reflect new source.

scm (5d0-1) unstable; urgency=low

  * New upstream.
  * Changed (terms) to access "/usr/doc/copyright/GPL".
  * Changed regex to use -lrx

scm (5c3-6) unstable; urgency=low

  * New maintainer.

1 files changed, 31 insertions, 23 deletions

diff --git a/mkimpcat.scm b/mkimpcat.scm
index 890d521..2f6c13a 100644
--- a/mkimpcat.scm
+++ b/mkimpcat.scm
@@ -12,7 +12,7 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with this software; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; the Free Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 ;;
 ;; As a special exception, the Free Software Foundation gives permission
 ;; for additional uses of the text contained in its release of GUILE.
@@ -41,15 +41,17 @@
 ;;;; "mkimpcat.scm" Build SCM-specific catalog for SLIB.
 ;;; Author: Aubrey Jaffer.
 
+(define (installation-vicinity) "/usr/lib/scm/")
+
 (let ((catname "implcat"))
   (call-with-output-file (in-vicinity (implementation-vicinity) catname)
     (lambda (op)
       (define (display* . args)
 	(for-each (lambda (arg) (display arg op)) args)
 	(newline op))
-      (define wb:vicinity (string-append (implementation-vicinity) "../wb/"))
+      (define wb:vicinity (string-append (installation-vicinity) "../wb/"))
       (define x-scm:vicinity
-	(string-append (implementation-vicinity) "../xscm-2.01/"))
+	(string-append (installation-vicinity) "../xscm-2.01/"))
       (define (add-link feature ofile . libs)
 	(cond ((file-exists? ofile)
 	       ;; remove #f from libs list
@@ -72,13 +74,14 @@
 	(display* "(")
 	(begin
 	  (cond ((add-link 'i/o-extensions
-			   (in-vicinity (implementation-vicinity) "ioext"
+			   (in-vicinity (installation-vicinity) "ioext"
 					link:able-suffix)
 			   (usr:lib "c"))
+		 (add-alias 'directory-for-each 'i/o-extensions)
 		 (add-alias 'line-i/o 'i/o-extensions)
 		 (add-alias 'pipe 'i/o-extensions)))
 	  (cond ((add-link 'rev2-procedures
-			   (in-vicinity (implementation-vicinity) "sc2"
+			   (in-vicinity (installation-vicinity) "sc2"
 					link:able-suffix))
 		 (add-alias  'rev3-procedures 'rev2-procedures)))
 	  (cond ((or
@@ -110,50 +113,55 @@
 		 (add-source 'xpm   (in-vicinity x-scm:vicinity "xpm"))))
 
 	  (add-link 'turtle-graphics
-		    (in-vicinity (implementation-vicinity) "turtlegr"
+		    (in-vicinity (installation-vicinity) "turtlegr"
 				 link:able-suffix)
 		    (x:lib "X11")
 		    (usr:lib "m")
 		    (usr:lib "c"))
+	  (add-link 'Xlib
+		    (in-vicinity (installation-vicinity) "x"
+				 link:able-suffix)
+		    (x:lib "X11")
+		    (usr:lib "c"))
 	  (add-link 'curses
-		    (in-vicinity (implementation-vicinity) "crs"
+		    (in-vicinity (installation-vicinity) "crs"
 				 link:able-suffix)
 		    (usr:lib "ncurses")
 		    ;;(usr:lib "curses")
 		    ;;(usr:lib "termcap")
 		    (usr:lib "c"))
 	  (add-link 'edit-line
-		    (in-vicinity (implementation-vicinity) "edline"
+		    (in-vicinity (installation-vicinity) "edline"
 				 link:able-suffix)
-		    (usr:lib "edit")
+		    (usr:lib "readline")
 		    (usr:lib "termcap")
 		    (usr:lib "c"))
 	  (add-link 'regex
-		    (in-vicinity (implementation-vicinity) "rgx"
+		    (in-vicinity (installation-vicinity) "rgx"
 				 link:able-suffix)
 		    (usr:lib "c"))
 	  (add-link 'unix
-		    (in-vicinity (implementation-vicinity) "unix"
+		    (in-vicinity (installation-vicinity) "unix"
 				 link:able-suffix)
-		    (in-vicinity (implementation-vicinity) "ioext"
+		    (in-vicinity (installation-vicinity) "ioext"
 				 link:able-suffix)
 		    (usr:lib "c"))
 	  (add-link 'posix
-		    (in-vicinity (implementation-vicinity) "posix"
+		    (in-vicinity (installation-vicinity) "posix"
 				 link:able-suffix)
 		    (usr:lib "c"))
 	  (add-link 'socket
-		    (in-vicinity (implementation-vicinity) "socket"
+		    (in-vicinity (installation-vicinity) "socket"
 				 link:able-suffix)
 		    (usr:lib "c"))
 	  (add-link 'record
-		    (in-vicinity (implementation-vicinity) "record"
+		    (in-vicinity (installation-vicinity) "record"
 				 link:able-suffix))
 	  (add-link 'generalized-c-arguments
-		    (in-vicinity (implementation-vicinity) "gsubr"
+		    (in-vicinity (installation-vicinity) "gsubr"
 				 link:able-suffix))
 	  (add-link 'array-for-each
-		    (in-vicinity (implementation-vicinity) "ramap"
+		    (in-vicinity (installation-vicinity) "ramap"
 				 link:able-suffix))
 	  )
 	(display* ")")
@@ -174,14 +182,14 @@
       (begin
 	;; Simple associations -- OK for all modes of dynamic-linking
 	(display* "(")
-	(add-alias 'hobbit (in-vicinity (implementation-vicinity) "hobbit"))
-	(add-alias 'scmhob (in-vicinity (implementation-vicinity) "scmhob"))
+	(add-alias 'hobbit (in-vicinity (installation-vicinity) "hobbit"))
+	(add-alias 'scmhob (in-vicinity (installation-vicinity) "scmhob"))
 	(add-alias 'regex-case
-		    (in-vicinity (implementation-vicinity) "rgxcase"))
+		    (in-vicinity (installation-vicinity) "rgxcase"))
 	(add-alias 'url-filename
-		    (in-vicinity (implementation-vicinity) "urlfile"))
+		    (in-vicinity (installation-vicinity) "urlfile"))
 	(add-source 'disarm (in-vicinity
-			     (implementation-vicinity)
+			     (installation-vicinity)
 			     (string-append "disarm" (scheme-file-suffix))))
 	(add-source 'build (in-vicinity
 			    (implementation-vicinity)
@@ -197,7 +205,7 @@
 	(display* "#.(if (defined? renamed-identifier)")
 	(display* "      '(")
 	(display "       " op)
-	(add-source 'macro (in-vicinity (implementation-vicinity) "Macro"))
+	(add-source 'macro (in-vicinity (installation-vicinity) "Macro"))
 	(display* "        )")
 	(display* "      '())")
 	)