diff -Nru maxima-5.41.0/debian/changelog maxima-5.41.0/debian/changelog --- maxima-5.41.0/debian/changelog 2018-01-20 16:02:08.000000000 +0000 +++ maxima-5.41.0/debian/changelog 2018-01-21 07:31:45.000000000 +0000 @@ -1,8 +1,8 @@ -maxima (5.41.0-23~201801201139~ubuntu17.10.1) artful; urgency=low +maxima (5.41.0-23~201801210617~ubuntu17.10.1) artful; urgency=low * Auto build. - -- Launchpad Package Builder Sat, 20 Jan 2018 16:02:08 +0000 + -- Launchpad Package Builder Sun, 21 Jan 2018 07:31:45 +0000 maxima (5.41.0-6) unstable; urgency=medium diff -Nru maxima-5.41.0/debian/git-build-recipe.manifest maxima-5.41.0/debian/git-build-recipe.manifest --- maxima-5.41.0/debian/git-build-recipe.manifest 2018-01-20 16:02:08.000000000 +0000 +++ maxima-5.41.0/debian/git-build-recipe.manifest 2018-01-21 07:31:45.000000000 +0000 @@ -1,3 +1,3 @@ -# git-build-recipe format 0.4 deb-version {debupstream}-23~201801201139 -lp:~peterpall/maxima/+git/maxima.code git-commit:c9519edb78ff0627dd60ea77d71991493e0ccdd9 +# git-build-recipe format 0.4 deb-version {debupstream}-23~201801210617 +lp:~peterpall/maxima/+git/maxima.code git-commit:5626cf837d217ef1c072d6fe9479b869dd830154 merge packaging lp:~peterpall/maxima/+git/maxima.code git-commit:3f1987c504f1d064b9e2855c335b7b2d2f42e6cd diff -Nru maxima-5.41.0/share/share_testsuite.lisp maxima-5.41.0/share/share_testsuite.lisp --- maxima-5.41.0/share/share_testsuite.lisp 2018-01-20 16:02:06.000000000 +0000 +++ maxima-5.41.0/share/share_testsuite.lisp 2018-01-21 07:31:44.000000000 +0000 @@ -48,11 +48,13 @@ "rtest_numericalio" ((mlist simp) "rtest_simplify_sum" 57) "rtest_solve_rec" - "rtest_stringproc" +#-gcl "rtest_stringproc" +#+gcl ((mlist simp) "rtest_stringproc" 14) "rtest_opproperties" "rtest_stats" "rtest_distrib" - "rtest_descriptive" +#-gcl "rtest_descriptive" +#+gcl ((mlist simp) "rtest_descriptive" 86 97) "rtest_interpol" "rtest_levin" "rtest_fractals" @@ -77,14 +79,17 @@ "arag_test" ((mlist simp) "rtest_pdiff" 62) ((mlist simp) "rtest_to_poly" 13 14 15 16 17 18 19 20 25) -#+clisp ((mlist simp) "rtestprintf" 27 38 61 63 65 69) -#-clisp ((mlist simp) "rtestprintf" 38 61 63 65 69) +#+clisp ((mlist simp) "rtestprintf" 27 38 61 63 65 69) +#+gcl ((mlist simp) "rtestprintf" 7 29 38 39 40 47 48 61 63 65 69 70) +#-(or clisp gcl) ((mlist simp) "rtestprintf" 38 61 63 65 69) "rtest_simplex" "rtest_graphs" ((mlist simp) "rtest_abs_integrate" 66 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 123 125 126 127 164 178) "rtest_pochhammer" - ((mlist simp) "rtest_to_poly_solve" 64 74 80 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 55 70 72 73 76 77 78 83 86 87 88 89 90 96 97 102 116 120 124 125 126 127 128 129 130 131 133 134 135 136 137 138 139 140 141 142 143 144 146 147 148 149 157 158 159 162 163 164 165 166 167 168 169 173 179 180 181 183 184 196 197 198 199 200 201 202 203 204 207 208 210 214 215 216 217 222 233 234 240 241 242 243 244 245 253 262 263 265 268 273 274 277 278 282 283 284 285 286 287 288 289 290 291 292 293 295 296 299 300 311 312 318 319 320 322) - ((mlist simp) "rtest_hg" 87) +#-gcl ((mlist simp) "rtest_to_poly_solve" 64 74 80 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 55 70 72 73 76 77 78 83 86 87 88 89 90 96 97 102 116 120 124 125 126 127 128 129 130 131 133 134 135 136 137 138 139 140 141 142 143 144 146 147 148 149 157 158 159 162 163 164 165 166 167 168 169 173 179 180 181 183 184 196 197 198 199 200 201 202 203 204 207 208 210 214 215 216 217 222 233 234 240 241 242 243 244 245 253 262 263 265 268 273 274 277 278 282 283 284 285 286 287 288 289 290 291 292 293 295 296 299 300 311 312 318 319 320 322) +#+gcl ((mlist simp) "rtest_to_poly_solve" 64 74 80 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 55 70 72 73 76 77 78 83 86 87 88 89 90 96 97 102 116 120 124 125 126 127 128 129 130 131 133 134 135 136 137 138 139 140 141 142 143 144 146 147 148 149 157 158 159 162 163 164 165 166 167 168 169 173 179 180 181 183 184 196 197 198 199 200 201 202 203 204 207 208 210 212 214 215 216 217 222 233 234 240 241 242 243 244 245 253 262 263 265 268 273 274 277 278 282 283 284 285 286 287 288 289 290 291 292 293 295 296 299 300 311 312 318 319 320 322) +#-gcl ((mlist simp) "rtest_hg" 87) +#+gcl ((mlist simp) "rtest_hg" 87 120) ((mlist simp) "rtest_nfloat" 25) "rtest_mnewton" "rtest_solve_rat_ineq" @@ -92,8 +97,11 @@ "rtest_antid" "rtest_bffac" "rtest_grobner" - "rtest_finance" +#-gcl "rtest_finance" +#+gcl ((mlist simp) "rtest_finance" 9 10 11) "rtest_fft" "rtest_rfft" - "rtest_decfp") +#-gcl "rtest_decfp" +#+gcl ((mlist simp) "rtest_decfp" 1 2 3 4) + ) ) diff -Nru maxima-5.41.0/src/init-cl.lisp maxima-5.41.0/src/init-cl.lisp --- maxima-5.41.0/src/init-cl.lisp 2018-01-20 16:02:06.000000000 +0000 +++ maxima-5.41.0/src/init-cl.lisp 2018-01-21 07:31:44.000000000 +0000 @@ -700,6 +700,21 @@ (setf (gethash s *builtin-symbol-props*) (copy-tree (symbol-plist s)))))) +;; Also store the property lists for symbols associated with operators; +;; e.g. MPLUS, MTIMES, etc. +;; Here we find them via the MHEADER property, which is used by the parser. +;; I don't know any better way to find these properties. + +(let ((maxima-package (find-package :maxima))) + (do-symbols (s maxima-package) + (let ((h (get s 'mheader))) + (when h + (let ((s1 (first h))) + (unless (gethash s1 *builtin-symbol-props*) + (push s1 *builtin-symbols*) + (setf (gethash s1 *builtin-symbol-props*) + (copy-tree (symbol-plist s1))))))))) + ;; Initialize assume database for $%pi, $%e, etc (dolist (c *builtin-numeric-constants*) (initialize-numeric-constant c)) diff -Nru maxima-5.41.0/tests/rtest1.mac maxima-5.41.0/tests/rtest1.mac --- maxima-5.41.0/tests/rtest1.mac 2018-01-20 16:02:06.000000000 +0000 +++ maxima-5.41.0/tests/rtest1.mac 2018-01-21 07:31:44.000000000 +0000 @@ -417,6 +417,19 @@ (put ("*", 'bar, 'foo), kill (all), string (a*b)); "a*b"; +/* SF bug #3387: kill(all) looses mtime's "nary" property + * (tickled by the preceding test) + */ + +xreduce ("*", []); +1; + +(put ("+", 'baz, 'quux), kill (all)); +done; + +xreduce ("+", []); +0; + /* reported to mailing list 2015-01-05: "order of operands is changed due to source information" */ block([simp:false], ?cons(?list('?mplus),?cdr([1,5,3])), string(%%)); diff -Nru maxima-5.41.0/tests/testsuite.lisp maxima-5.41.0/tests/testsuite.lisp --- maxima-5.41.0/tests/testsuite.lisp 2018-01-20 16:02:06.000000000 +0000 +++ maxima-5.41.0/tests/testsuite.lisp 2018-01-21 07:31:44.000000000 +0000 @@ -9,7 +9,7 @@ `((mlist simp) "rtest_rules" "rtestnset" - ((mlist) "rtest1" 180 182 183) + ((mlist) "rtest1" 183 185 186) ((mlist) "rtest1a" 33) ((mlist) "rtest2" 86 95) "rtest4"