[maxima-sage] 03/05: Apply debdiff from #779804.
Tobias Hansen
thansen at moszumanska.debian.org
Sat Oct 15 23:12:11 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 9e1d7c74409ab3965b5fddb2f1ebb4b7f3447b7f
Author: Tobias Hansen <thansen at debian.org>
Date: Fri Oct 14 12:58:23 2016 +0100
Apply debdiff from #779804.
---
debian/changelog | 9 +++++++++
debian/control | 18 +++++++++++++++++-
debian/maxima-ecl.install.in | 2 ++
debian/maxima.install.in | 3 ++-
debian/patches/build-fasl.patch | 21 +++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 9 +++++++--
7 files changed, 59 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 82c86aa..5772bb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+maxima (5.38.1-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Create new package maxima-ecl including the maxima ecl binary
+ and a fasl library for ecl.
+ * Apply patch build-fasl.patch from Sage to build the fasl library.
+
+ -- Tobias Hansen <thansen at debian.org> Mon, 02 Mar 2015 18:33:29 +0100
+
maxima (5.38.1-2) unstable; urgency=medium
* Build-dep against latest gcl
diff --git a/debian/control b/debian/control
index 8d7f110..0efdd32 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-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, ecl, libffi-dev
Standards-Version: 3.9.8
Package: maxima
@@ -123,3 +123,19 @@ Description: Computer algebra system -- extra code
.
This package contains a set of contributed routines and add-on
packages.
+
+Package: maxima-ecl
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, maxima
+Description: Computer algebra system -- ecl runtime and fasl library
+ Maxima is a fully symbolic computation program. It is full featured
+ doing symbolic manipulation of polynomials, matrices, rational
+ functions, integration, Todd-coxeter methods for finite group
+ analysis, graphing, multiple precision floating point computation.
+ It has a symbolic source level debugger for maxima code. Maxima is
+ based on the original Macsyma developed at MIT in the 1970s. It is
+ quite reliable, and has good garbage collection, and no memory leaks.
+ It comes with hundreds of self tests.
+ .
+ This package contains a maxima runtime compiled with ecl
+ as well as well as a fasl library of maxima for ecl.
diff --git a/debian/maxima-ecl.install.in b/debian/maxima-ecl.install.in
new file mode 100644
index 0000000..996c2bb
--- /dev/null
+++ b/debian/maxima-ecl.install.in
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/maxima/@MVERS@/binary-ecl/maxima
+debian/tmp/usr/lib/ecl/maxima.fas
diff --git a/debian/maxima.install.in b/debian/maxima.install.in
index 7f340dd..2de907c 100644
--- a/debian/maxima.install.in
+++ b/debian/maxima.install.in
@@ -1,5 +1,6 @@
debian/tmp/usr/bin/maxima
-debian/tmp/usr/lib
+debian/tmp/usr/lib/maxima/@MVERS@/binary-gcl/maxima
+debian/tmp/usr/lib/maxima/@MVERS@/mgnuplot
debian/tmp/usr/share/man/man1/maxima.1
debian/tmp/usr/share/maxima/@MVERS@/demo
debian/tmp/usr/share/doc/maxima
diff --git a/debian/patches/build-fasl.patch b/debian/patches/build-fasl.patch
new file mode 100644
index 0000000..48a3ea0
--- /dev/null
+++ b/debian/patches/build-fasl.patch
@@ -0,0 +1,21 @@
+Description: Build a fasl library for ecl in addition to an executable program.
+ References:
+ * http://trac.sagemath.org/ticket/16178
+ * https://github.com/cschwan/sage-on-gentoo/issues/226
+ * https://bugs.gentoo.org/show_bug.cgi?id=499634
+Origin: http://git.sagemath.org/sage.git/tree/build/pkgs/maxima/patches/build-fasl.patch
+
+--- a/src/maxima.system
++++ b/src/maxima.system
+@@ -76,6 +76,11 @@
+ ;; Convert dir/foo.fas to dir/foo.o
+ (make-pathname :type "o" :defaults p))
+ files)))
++ (c::build-fasl "binary-ecl/maxima" :lisp-files obj
++ :ld-flags
++ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
++ (find-package "MAXIMA")))))
++ (if (and x (not (string= x ""))) (list x))))
+ (c::build-program "binary-ecl/maxima" :lisp-files obj
+ :ld-flags
+ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
diff --git a/debian/patches/series b/debian/patches/series
index 88a7173..113fe30 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ taylor_test_errors
fix_closeto_test
cl_info_separate_index_dir
do_not_remake_docs_2
+build-fasl.patch
diff --git a/debian/rules b/debian/rules
index f48bb95..8f42112 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,6 +56,7 @@ build-stamp:
echo '(progn (setq si::*optimize-maximum-pages* nil)(si::save-system "gcl"))' | GCL_ANSI=t gcl
git_found=false PATH=$$(pwd):$$PATH GCL_ANSI=t ./configure --enable-gcl $$(gcl -batch -eval '(progn #-native-reloc(princ "--enable-gcl-alt-link"))') \
+ --enable-ecl \
--enable-sys-proclaim \
--prefix=/usr \
--libexec=/usr/lib \
@@ -146,6 +147,10 @@ install-stamp: build-stamp $(BOOK) $(INSTALLS) debian/ChangeLog
$(MAKE) install DESTDIR=$$(pwd)/debian/tmp INSTALL="/usr/bin/install -D"
+ mkdir -p $$(pwd)/debian/tmp/usr/lib/ecl
+ cp $$(pwd)/src/binary-ecl/maxima.fas \
+ debian/tmp/usr/lib/ecl/
+
mkdir -p $$(pwd)/debian/tmp/usr/share/doc/maxima-doc
cp -a debian/tmp/usr/share/maxima/$(MVERS)/doc/* \
$$(pwd)/debian/tmp/usr/share/doc/maxima-doc
@@ -229,7 +234,7 @@ binary-indep: build install
dh_installchangelogs -i debian/ChangeLog
dh_link -i
dh_strip -i
- dh_compress -i -X.shtml -X.hh -Xmaxima-index.lisp
+ dh_compress -i -X.shtml -X.hh -X.info
dh_fixperms -i
dh_installdeb -i
dh_shlibdeps -i
@@ -252,7 +257,7 @@ binary-arch: build install
dh_installchangelogs -a debian/ChangeLog
dh_link -a
dh_strip -a $(NO_STRIP)
- dh_compress -a
+ dh_compress -a -Xmaxima-index.lisp
dh_fixperms -a
dh_installdeb -a
dh_shlibdeps -a
--
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