Import Debian changes 5d9-4.1debian/5d9-4.1

scm (5d9-4.1) unstable; urgency=high

  * Non-maintainer upload.
  * High-urgency upload for sarge-targetted RC bugfix.
  * Revert upstream "CAUTIOUS" define, which causes the scm build to
    fail its test suite on alpha (and, it appears, powerpc as well).
    Closes: #245810.

scm (5d9-4) unstable; urgency=low

  * Apply patch from 144062 to fix hppa build (Closes: #144062)
  * Change scm.1 section from Jan 4 200 to 1. (lintian)

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

  * Properly clean up info files.
  * Make and install Xlibscm.info.

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

  * Fix path problem in slibcat.  Hack at mklibcat.scm.  (Closes: #241510)

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

  * New upstream release
  * Merge NMU sparc changes (Closes: #191171, #191356)
  * SHORT_INT is defined for ia64 upstream (Closes: #141928)
  * Scheme imps now grouped in info file (has been for a while)
  (Closes: #115452)

1 files changed, 11 insertions, 11 deletions

diff --git a/debug.c b/debug.c
index 22c387b..aff8251 100644
--- a/debug.c
+++ b/debug.c
@@ -82,7 +82,7 @@ SCM scm_env_rlookup(addr, stenv, what)
   for (env = stenv; NIMP(env); env = CDR(env)) {
     fr = CAR(env);
     if (INUMP(fr)) {
-      ASSERT(NIMP(env) && CONSP(env), stenv, s_badenv, what);
+      ASRTER(NIMP(env) && CONSP(env), stenv, s_badenv, what);
       env = CDR(env);
       continue;
     }
@@ -122,7 +122,7 @@ SCM scm_env_getprop(prop, env)
       if (INUMP(CAR(e))) {
 	if (CAR(e)==prop) return CDR(e);
 	e = CDR(e);
-	ASSERT(NIMP(e), env, s_badenv, "env_getprop");
+	ASRTER(NIMP(e), env, s_badenv, "env_getprop");
       }
       e = CDR(e);
     }
@@ -348,7 +348,7 @@ SCM scm_int2linum(n)
      SCM n;
 {
   int i = INUM(n);
-  ASSERT(INUMP(n) && i >= 0, n, ARG1, s_int2linum);
+  ASRTER(INUMP(n) && i >= 0, n, ARG1, s_int2linum);
   return SCM_MAKE_LINUM(i);
 }
 
@@ -356,7 +356,7 @@ static char s_linum2int[] = "line-number->integer";
 SCM scm_linum2int(linum)
      SCM linum;
 {
-  ASSERT(SCM_LINUMP(linum), linum, ARG1, s_linum2int);
+  ASRTER(SCM_LINUMP(linum), linum, ARG1, s_linum2int);
   return MAKINUM(SCM_LINUM(linum));
 }
 
@@ -490,7 +490,7 @@ SCM scm_stack_trace(contin)
   }
   else {
     CONTINUATION *cont;
-    ASSERT(NIMP(contin) && (tc7_contin==TYP7(contin)), contin, ARG1,
+    ASRTER(NIMP(contin) && (tc7_contin==TYP7(contin)), contin, ARG1,
 	   s_stack_trace);
     cont = CONT(contin);
     estk = cont->other.estk;
@@ -504,9 +504,9 @@ SCM scm_frame_trace(contin, nf)
      SCM contin, nf;
 {
     SCM *stkframe, code, env;
-    ASSERT(NIMP(contin) && tc7_contin==TYP7(contin), contin, ARG1,
+    ASRTER(NIMP(contin) && tc7_contin==TYP7(contin), contin, ARG1,
 	   s_frame_trace);
-    ASSERT(INUMP(nf) && INUM(nf) >= 0, nf, ARG2, s_frame_trace);
+    ASRTER(INUMP(nf) && INUM(nf) >= 0, nf, ARG2, s_frame_trace);
     if (!(stkframe = cont_frame(contin, INUM(nf))))
       return BOOL_F;
     env = stkframe[2];
@@ -521,9 +521,9 @@ SCM scm_frame2env(contin, nf)
      SCM contin, nf;
 {
     SCM *stkframe;
-    ASSERT(NIMP(contin) && tc7_contin==TYP7(contin), contin, ARG1,
+    ASRTER(NIMP(contin) && tc7_contin==TYP7(contin), contin, ARG1,
 	   s_frame2env);
-    ASSERT(INUMP(nf) && INUM(nf) >= 0, nf, ARG2, s_frame2env);
+    ASRTER(INUMP(nf) && INUM(nf) >= 0, nf, ARG2, s_frame2env);
     if (!(stkframe = cont_frame(contin, INUM(nf))))
       return BOOL_F;
     return stkframe[2];
@@ -534,9 +534,9 @@ SCM scm_frame_eval(contin, nf, expr)
      SCM contin, nf, expr;
 {
     SCM res, env, *stkframe;
-    ASSERT(NIMP(contin) && tc7_contin==TYP7(contin), contin, ARG1,
+    ASRTER(NIMP(contin) && tc7_contin==TYP7(contin), contin, ARG1,
 	   s_frame_eval);
-    ASSERT(INUMP(nf) && INUM(nf) >= 0, nf, ARG2, s_frame_eval);
+    ASRTER(INUMP(nf) && INUM(nf) >= 0, nf, ARG2, s_frame_eval);
     if (!(stkframe = cont_frame(contin, INUM(nf))))
       return BOOL_F;
     env = stkframe[2];