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, 18 insertions, 18 deletions

diff --git a/eval.c b/eval.c
index e616382..86c56a3 100644
--- a/eval.c
+++ b/eval.c
@@ -356,7 +356,7 @@ static void debug_env_warn(fnam, line, what)
 {
   lputs(fnam, cur_errp);
   lputc(':', cur_errp);
-  intprint(line+0L, 10, cur_errp);
+  scm_intprint(line+0L, 10, cur_errp);
   lputs(": unprotected ", cur_errp);
   lputs(what, cur_errp);
   lputs(" of ecache value\n", cur_errp);
@@ -415,7 +415,7 @@ SCM *ilookup(iloc)
   /* shortcut the two most common cases. */
   if (iloc==MAKILOC(0, 0)) return &CAR(CAR(er));
   if (iloc==MAKILOC(0, 1)) return &CAR(CDR(CAR(er)));
-  for(;0 != ir;--ir) er = CDR(er);
+  for (;0 != ir;--ir) er = CDR(er);
   eloc = &CAR(er);
   for (ir = IDIST(iloc); 0 != ir; --ir)
     eloc = &CDR(*eloc);
@@ -436,7 +436,7 @@ SCM *farlookup(farloc)
     return &CAR(CAR(er));
   }
   er = CAR(er);
-  for(--ir;0 != ir;--ir) er = CDR(er);
+  for (--ir;0 != ir;--ir) er = CDR(er);
   if (IM_FARLOC_CDR==CAR(farloc)) return &CDR(er);
   return &CAR(CDR(er));
 }
@@ -813,13 +813,13 @@ static void ecache_undefs(x)
      SCM x;
 {
   static SCM argv[10] = {UNDEFINED, UNDEFINED, UNDEFINED,
-                         UNDEFINED, UNDEFINED, UNDEFINED, 
+                         UNDEFINED, UNDEFINED, UNDEFINED,
                          UNDEFINED, UNDEFINED, UNDEFINED,
                          UNDEFINED};
 
   int imax = sizeof(argv)/sizeof(SCM);
   int i = 0;
-    
+
   scm_env_tmp = EOL;
   while NIMP(x) {
     if (imax==i) {
@@ -1390,7 +1390,7 @@ static SCM iqq(form)
     long i = LENGTH(form);
     SCM *data = VELTS(form);
     tmp = EOL;
-    for(;--i >= 0;) tmp = cons(data[i], tmp);
+    for (;--i >= 0;) tmp = cons(data[i], tmp);
     return vector(iqq(tmp));
   }
   if (NCONSP(form)) return form;
@@ -1413,9 +1413,9 @@ static SCM m_iqq(form, depth, env, ctxt)
     long i = LENGTH(form);
     SCM *data = VELTS(form);
     tmp = EOL;
-    for(;--i >= 0;) tmp = cons(data[i], tmp);
+    for (;--i >= 0;) tmp = cons(data[i], tmp);
     tmp = m_iqq(tmp, depth, env, ctxt);
-    for(i = 0; i < LENGTH(form); i++) {
+    for (i = 0; i < LENGTH(form); i++) {
       data[i] = CAR(tmp);
       tmp = CDR(tmp);
     }
@@ -2219,7 +2219,7 @@ static SCM ceval_1(x)
     EXTEND_VALENV;
     x = CDR(CDR(x));
     while (proc = CAR(x), FALSEP(EVALCAR(proc))) {
-      for(proc = CAR(CDR(x));NIMP(proc);proc = CDR(proc)) {
+      for (proc = CAR(CDR(x));NIMP(proc);proc = CDR(proc)) {
 	arg1 = CAR(proc);	/* body */
 	SIDEVAL_1(arg1);
       }
@@ -2872,7 +2872,7 @@ SCM nconc2copy(lst)
 #endif
   last = CAR(*lloc);
   *lloc = EOL;
-  for(; NIMP(last); last=CDR(last)) {
+  for (; NIMP(last); last=CDR(last)) {
     *lloc = cons(CAR(last), EOL);
     lloc = &CDR(*lloc);
   }
@@ -2886,7 +2886,7 @@ SCM scm_cp_list(lst, minlen)
 {
   SCM res, *lloc = &res;
   res = EOL;
-  for(; NIMP(lst) && CONSP(lst); lst = CDR(lst)) {
+  for (; NIMP(lst) && CONSP(lst); lst = CDR(lst)) {
     *lloc = cons(CAR(lst), EOL);
     lloc = &CDR(*lloc);
     minlen--;
@@ -2900,7 +2900,7 @@ SCM scm_v2lst(n, v, end)
      SCM *v, end;
 {
   SCM res = end;
-  for(n--; n >= 0; n--) res = cons(v[n], res);
+  for (n--; n >= 0; n--) res = cons(v[n], res);
   return res;
 }
 SCM apply(proc, arg1, args)
@@ -3214,7 +3214,7 @@ static int prinprom(exp, port, writing)
   lputs("#<promise", port);
   if ((2L<<16) & CAR(exp)) lputc('*', port);
   lputc(' ', port);
-  iprin1(CDR(exp), port, writing);
+  scm_iprin1(CDR(exp), port, writing);
   lputc('>', port);
   return !0;
 }
@@ -3312,7 +3312,7 @@ static int prinmacro(exp, port, writing)
   }
   if (MAC_TYPE(exp) & MAC_MEMOIZING) lputc('!', port);
   lputc(' ', port);
-  iprin1(CDR(exp), port, writing);
+  scm_iprin1(CDR(exp), port, writing);
   lputc('>', port);
   return !0;
 }
@@ -3322,8 +3322,8 @@ static int prinenv(exp, port, writing)
      int writing;
 {
   lputs("#<environment ", port);
-  intprint((long)exp, -16, port);
-  /* iprin1(CDR(exp), port, writing); */
+  scm_intprint((long)exp, -16, port);
+  /* scm_iprin1(CDR(exp), port, writing); */
   lputc('>', port);
   return !0;
 }
@@ -3336,9 +3336,9 @@ static int prinid(exp, port, writing)
   SCM s = IDENT_PARENT(exp);
   while (M_IDENTP(s)) s = IDENT_PARENT(s);
   lputs("#<id ", port);
-  iprin1(s, port, writing);
+  scm_iprin1(s, port, writing);
   lputc(':', port);
-  intprint((long)exp, -16, port);
+  scm_intprint((long)exp, -16, port);
   lputc('>', port);
   return !0;
 }