Import Debian changes 5e4-1debian/5e4-1

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

  * New upstream release.
  * debian/control: Require at least version 3a5 of slib.
  
  * debian/postrm: New file to remove /usr/lib/scm/implcat and
    /usr/lib/scm/slibcat upon purge.  (Closes: #455124).  Thanks to Kumar
    Appaiah for the fix.
  
  * debian/control (Architecture): Add armel and armeb. (Closes: #408792).
  
  * debian/rules (install): Don't use -s when installing.  dh_strip should
    be sufficient, and this should make the nostrip build option work.
    (Closes: #438004).

  * continue.h: Repeat change from 5e1-2.
  
  * xgen.scm: Repeat change from 5e2-4.
  
  * scm.1: Repeat change from 5e2-4.
  
  * build.scm: Repeat change from 5e3-5.

1 files changed, 4 insertions, 4 deletions

diff --git a/socket.c b/socket.c
index c2d1394..fdbcfa2 100644
--- a/socket.c
+++ b/socket.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -173,7 +173,7 @@ SCM l_hostinfo(name)
   ve[ 3] = MAKINUM(entry->h_length + 0L);
   if (sizeof(struct in_addr) != entry->h_length)
     {ve[ 4] = BOOL_F; return ans;}
-  for(argv = entry->h_addr_list; argv[i]; i++);
+  for (argv = entry->h_addr_list; argv[i]; i++);
   while (i--) {
     inad = *(struct in_addr *)argv[i];
     lst = cons(ulong2num(ntohl(inad.s_addr)), lst);
@@ -535,11 +535,11 @@ int sknm_print(exp, port, writing)
     lputs("inet-addr ", port);
     lputs(inet_ntoa(((struct sockaddr_in *)CDR(exp))->sin_addr), port);
     lputc(':', port);
-    intprint(0L + ntohs(((struct sockaddr_in *)CDR(exp))->sin_port), 10, port);
+    scm_intprint(0L + ntohs(((struct sockaddr_in *)CDR(exp))->sin_port), 10, port);
     break;
   default: lputs(s_unkfam, port);
     lputc(' ', port);
-    intprint(0L+((struct sockaddr *)CDR(exp))->sa_family, 10, port);
+    scm_intprint(0L+((struct sockaddr *)CDR(exp))->sa_family, 10, port);
   }
   lputc('>', port);
   return !0;