[maxima-sage] 01/02: Import Debian patch 5.38.1-5

Tobias Hansen thansen at moszumanska.debian.org
Sun Nov 6 10:35:21 UTC 2016


This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository maxima-sage.

commit 860256e41f2e878f3cffe7cb2fa642114c7959cb
Author: Camm Maguire <camm at debian.org>
Date:   Tue Nov 1 13:00:12 2016 +0000

    Import Debian patch 5.38.1-5
---
 debian/changelog         | 20 ++++++++++++
 debian/control           |  2 +-
 debian/patches/pathname  | 84 ++++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/pathname1 | 60 ++++++++++++++++++++++++++++++++++
 debian/patches/series    |  2 ++
 debian/test_results.out  | 10 +++---
 6 files changed, 172 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 82c86aa..95bed0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+maxima (5.38.1-5) unstable; urgency=medium
+
+  * Build-dep against latest gcl
+
+ -- Camm Maguire <camm at debian.org>  Tue, 01 Nov 2016 13:00:12 +0000
+
+maxima (5.38.1-4) unstable; urgency=medium
+
+  * Build-dep against latest gcl
+  * Bug fix: "maxima-emacs does not work", thanks to Bastien ROUCARIES
+    (Closes: #842164).
+
+ -- Camm Maguire <camm at debian.org>  Sat, 29 Oct 2016 11:11:52 +0000
+
+maxima (5.38.1-3) unstable; urgency=medium
+
+  * Build-dep against latest gcl
+
+ -- Camm Maguire <camm at debian.org>  Tue, 11 Oct 2016 20:59:25 +0000
+
 maxima (5.38.1-2) unstable; urgency=medium
 
   * Build-dep against latest gcl
diff --git a/debian/control b/debian/control
index 8d7f110..2cf4543 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: maxima
 Section: math
 Priority: optional
 Maintainer: Camm Maguire <camm at debian.org>
-Build-Depends: gcl ( >= 2.6.12-35 ) , texinfo, libgmp3-dev, libreadline-dev, locales, automake, debhelper ( >=9 ), autoconf2.13, gawk | awk, texlive-latex-recommended, sharutils, libxmu-dev, libxaw7-dev, tex-common, python
+Build-Depends: gcl ( >= 2.6.12-45 ) , texinfo, libgmp3-dev, libreadline-dev, locales, automake, debhelper ( >=9 ), autoconf2.13, gawk | awk, texlive-latex-recommended, sharutils, libxmu-dev, libxaw7-dev, tex-common, python
 Standards-Version: 3.9.8
 
 Package: maxima
diff --git a/debian/patches/pathname b/debian/patches/pathname
new file mode 100644
index 0000000..053f226
--- /dev/null
+++ b/debian/patches/pathname
@@ -0,0 +1,84 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ maxima (5.38.1-2) unstable; urgency=medium
+ .
+   * Build-dep against latest gcl
+   * Bug fix: "FTBFS: tests failures", thanks to Lucas Nussbaum (Closes:
+     #831248).
+Author: Camm Maguire <camm at debian.org>
+Bug-Debian: https://bugs.debian.org/831248
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2016-10-11
+
+--- maxima-5.38.1.orig/lisp-utils/defsystem.lisp
++++ maxima-5.38.1/lisp-utils/defsystem.lisp
+@@ -1843,11 +1843,11 @@ s/^[^M]*IRIX Execution Environment 1, *[
+ 	 (rel-directory (directory-to-list (pathname-directory rel-dir)))
+ 	 (rel-keyword (when (keywordp (car rel-directory))
+ 			(pop rel-directory)))
+-         #-(or :MCL :sbcl :clisp :cmu) (rel-file (file-namestring rel-dir))
++         #-(or :MCL :gcl :sbcl :clisp :cmu) (rel-file (file-namestring rel-dir))
+ 	 ;; Stig (July 2001);
+ 	 ;; These values seems to help clisp as well
+-	 #+(or :MCL :sbcl :clisp :cmu) (rel-name (pathname-name rel-dir))
+-	 #+(or :MCL :sbcl :clisp :cmu) (rel-type (pathname-type rel-dir))
++	 #+(or :MCL :gcl :sbcl :clisp :cmu) (rel-name (pathname-name rel-dir))
++	 #+(or :MCL :gcl :sbcl :clisp :cmu) (rel-type (pathname-type rel-dir))
+ 	 (directory nil))
+ 
+     ;; TI Common Lisp pathnames can return garbage for file names because
+@@ -1873,7 +1873,7 @@ s/^[^M]*IRIX Execution Environment 1, *[
+ 
+     (when (and abs-name (not (null-string abs-name))) ; was abs-name
+       (cond ((and (null abs-directory) (null abs-keyword))
+-	     #-(or :lucid :kcl :akcl TI) (setf abs-keyword :relative)
++	     #-(or :lucid TI) (setf abs-keyword :relative)
+ 	     (setf abs-directory (list abs-name)))
+ 	    (t
+ 	     (setf abs-directory (append abs-directory (list abs-name))))))
+@@ -1886,11 +1886,11 @@ s/^[^M]*IRIX Execution Environment 1, *[
+ 	       rel-keyword)
+       ;; The following feature switches seem necessary in CMUCL
+       ;; Marco Antoniotti 19990707
+-      #+(or :sbcl :CMU)
++      #+(or :gcl :sbcl :CMU)
+       (if (typep abs-dir 'logical-pathname)
+ 	  (setf abs-keyword :absolute)
+ 	  (setf abs-keyword rel-keyword))
+-      #-(or :sbcl :CMU)
++      #-(or :gcl :sbcl :CMU)
+       (setf abs-keyword rel-keyword))
+     (setf directory (append abs-directory rel-directory))
+     (when abs-keyword (setf directory (cons abs-keyword directory)))
+@@ -1900,11 +1900,11 @@ s/^[^M]*IRIX Execution Environment 1, *[
+                     :directory
+                     directory
+ 		    :name
+-		    #-(or :sbcl :MCL :clisp :cmu) rel-file
+-		    #+(or :sbcl :MCL :clisp :cmu) rel-name
++		    #-(or :gcl :sbcl :MCL :clisp :cmu) rel-file
++		    #+(or :gcl :sbcl :MCL :clisp :cmu) rel-name
+ 
+-		    #+(or :sbcl :MCL :clisp :cmu) :type
+-		    #+(or :sbcl :MCL :clisp :cmu) rel-type
++		    #+(or :gcl :sbcl :MCL :clisp :cmu) :type
++		    #+(or :gcl :sbcl :MCL :clisp :cmu) rel-type
+ 		    ))))
+ 
+ #-scl
diff --git a/debian/patches/pathname1 b/debian/patches/pathname1
new file mode 100644
index 0000000..f453785
--- /dev/null
+++ b/debian/patches/pathname1
@@ -0,0 +1,60 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ maxima (5.38.1-3) unstable; urgency=medium
+ .
+   * Build-dep against latest gcl
+Author: Camm Maguire <camm at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2016-10-13
+
+--- maxima-5.38.1.orig/lisp-utils/defsystem.lisp
++++ maxima-5.38.1/lisp-utils/defsystem.lisp
+@@ -1818,7 +1818,6 @@ s/^[^M]*IRIX Execution Environment 1, *[
+ ;;;       "[root.subdir]BAZ"
+ ;;;       "[root.][subdir]BAZ"
+ ;;; Use #+:vaxlisp for VAXLisp 3.0, #+(and vms dec common vax) for v2.2
+-
+ #-scl
+ (defun new-append-directories (absolute-dir relative-dir)
+   ;; Version of append-directories for CLtL2-compliant lisps. In particular,
+@@ -1873,7 +1872,7 @@ s/^[^M]*IRIX Execution Environment 1, *[
+ 
+     (when (and abs-name (not (null-string abs-name))) ; was abs-name
+       (cond ((and (null abs-directory) (null abs-keyword))
+-	     #-(or :lucid TI) (setf abs-keyword :relative)
++	     #-(or :lucid TI) (setf abs-keyword (car (pathname-directory "./")))
+ 	     (setf abs-directory (list abs-name)))
+ 	    (t
+ 	     (setf abs-directory (append abs-directory (list abs-name))))))
+@@ -1906,6 +1905,7 @@ s/^[^M]*IRIX Execution Environment 1, *[
+ 		    #+(or :gcl :sbcl :MCL :clisp :cmu) :type
+ 		    #+(or :gcl :sbcl :MCL :clisp :cmu) rel-type
+ 		    ))))
++;(trace new-append-directories)
+ 
+ #-scl
+ (defun directory-to-list (directory)
+@@ -1928,6 +1928,7 @@ s/^[^M]*IRIX Execution Environment 1, *[
+ 		(split-string directory :item #\/))))
+ 	(t
+ 	 (coerce directory 'list))))
++;(trace directory-to-list)
+ 
+ 
+ (defparameter *append-dirs-tests*
diff --git a/debian/patches/series b/debian/patches/series
index 88a7173..e2e45d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,5 @@ taylor_test_errors
 fix_closeto_test
 cl_info_separate_index_dir
 do_not_remake_docs_2
+pathname
+pathname1
diff --git a/debian/test_results.out b/debian/test_results.out
index a469192..c2efabc 100644
--- a/debian/test_results.out
+++ b/debian/test_results.out
@@ -11,7 +11,7 @@ Running tests in rtest1: 180/180 tests passed (not counting 1 expected errors)
 Running tests in rtest1a: 27/27 tests passed
 Running tests in rtest2: 144/144 tests passed (not counting 2 expected errors)
 Running tests in rtest4: 93/93 tests passed
-Running tests in rtest5: start address -T 0x28dd010 start address -T 0x290d630 start address -T 0x2914cc0 start address -T 0x2919180 start address -T 0x291d640 start address -T 0x2925f00 start address -T 0x292aff0 start address -T 0x292eb50 80/80 tests passed
+Running tests in rtest5: start address -T 0x2832010 start address -T 0x28625c0 start address -T 0x2869c50 start address -T 0x286e110 start address -T 0x28725d0 start address -T 0x287adc0 start address -T 0x287fe90 start address -T 0x28839f0 80/80 tests passed
 Running tests in rtest6: 39/39 tests passed
 Running tests in rtest6a: 62/62 tests passed
 Running tests in rtest6b: 16/16 tests passed
@@ -97,8 +97,8 @@ Running tests in rtest_plotoptions: 1/1 tests passed
 
 
 No unexpected errors found out of 10,625 tests.
-real time       :    248.110 secs
-run-gbc time    :    189.990 secs
-child run time  :     20.120 secs
-gbc time        :     28.280 secs
+real time       :    889.950 secs
+run-gbc time    :    233.580 secs
+child run time  :     26.399 secs
+gbc time        :     35.200 secs
 (%o0)                                done

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/maxima-sage.git



More information about the debian-science-commits mailing list