diff -u maxima-5.17.1/debian/control maxima-5.17.1/debian/control --- maxima-5.17.1/debian/control +++ maxima-5.17.1/debian/control @@ -1,7 +1,8 @@ Source: maxima Section: math Priority: optional -Maintainer: Camm Maguire +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Camm Maguire Build-Depends: gcl ( >= 2.6.7-44 ) , texinfo, libgmp3-dev, libreadline5-dev | libreadline-dev, locales, automake1.9, debhelper ( >=4.1.0 ) , libncurses5-dev, autoconf2.13, gawk | awk, texlive-latex-recommended, sharutils, libxmu-dev, libxaw7-dev Standards-Version: 3.8.0 diff -u maxima-5.17.1/debian/maxima-emacs.emacsen-startup maxima-5.17.1/debian/maxima-emacs.emacsen-startup --- maxima-5.17.1/debian/maxima-emacs.emacsen-startup +++ maxima-5.17.1/debian/maxima-emacs.emacsen-startup @@ -14,9 +14,6 @@ (debian-pkg-add-load-path-item (concat "/usr/share/" (symbol-name debian-emacs-flavor) "/site-lisp/maxima")) -;(setq load-path (cons (concat "/usr/share/" -; (symbol-name debian-emacs-flavor) -; "/site-lisp/maxima") load-path )) ; To enable maxima-info and maxima-help from emacs menu on Debian ; auto-compression-mode must be on for maxima-help @@ -27,7 +24,2 @@ - -; For emaxima.lisp to be found and tex update mode to be enabled. -; -(debian-pkg-add-load-path-item "/usr/share/emacs/site-lisp/maxima") -; (autoload 'emaxima-mode "emaxima" "" t) diff -u maxima-5.17.1/debian/changelog maxima-5.17.1/debian/changelog --- maxima-5.17.1/debian/changelog +++ maxima-5.17.1/debian/changelog @@ -1,3 +1,20 @@ +maxima (5.17.1-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #296643), remaining changes: + - debian/maxima-doc.doc-base.plotting: + + Use .shtml instead of .html to fix lintian errors. + - debian/maxima-emacs.emacsen-install: + + Install symlinks for source files rather than copying them. This + makes find-function work. + + Install symlink for *.lisp so that we don't need to add + /usr/share/emacs/site-lisp/maxima to load-path. + - debian/maxima-emacs.emacsen-startup: + + Remove use of /usr/share/emacs/site-lisp/maxima, since this + causes load-path shadows and is not needed anymore. + - Comment out backward-delete-char-untabify in maxima.el. + + -- Benjamin Drung Fri, 10 Jul 2009 01:08:06 +0200 + maxima (5.17.1-1) unstable; urgency=low * New upstream release @@ -54,6 +71,23 @@ -- Camm Maguire Tue, 29 Jul 2008 17:20:19 -0400 +maxima (5.13.0-3ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/maxima-doc.doc-base.{tips,plotting}: + + Use .shtml instead of .html to fix lintian errors. + - debian/maxima-emacs.emacsen-install: + + Install symlinks for source files rather than copying them. This + makes find-function work. + + Install symlink for *.lisp so that we don't need to add + /usr/share/emacs/site-lisp/maxima to load-path. + - debian/maxima-emacs.emacsen-startup: + + Remove use of /usr/share/emacs/site-lisp/maxima, since this + causes load-path shadows and is not needed anymore. + - Comment out backward-delete-char-untabify in maxima.el. + + -- William Grant Wed, 12 Dec 2007 18:13:33 +1100 + maxima (5.13.0-3) unstable; urgency=low * Bug fix: "maxima-doc: installs info pages with the wrong section", @@ -91,6 +125,33 @@ -- Camm Maguire Fri, 19 Oct 2007 16:42:14 -0400 +maxima (5.12.0-1ubuntu2) gutsy; urgency=low + + * Closes LP: #124415 + * debian/control: Add emacs22 as a Depends option. + * debian/maxima-doc.doc-base.tips: + - Use .shtml instead of .html to fix a lintian error. + * debian/maxima-doc.doc-base.plotting: + - Use .shtml instead of .html to fix a lintian error. + * debian/maxima-emacs.emacsen-install: + - Install symlinks for source files rather than copying them. This + makes find-function work. + - Install symlink for *.lisp so that we don't need to add + /usr/share/emacs/site-lisp/maxima to load-path. + * debian/maxima-emacs.emacsen-startup: + - Remove use of /usr/share/emacs/site-lisp/maxima, since this + causes load-path shadows and is not needed anymore. + + -- Michael W. Olson (GNU address) Fri, 06 Jul 2007 10:03:12 -0400 + +maxima (5.12.0-1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Comment out backward-delete-char-untabify in maxima.el. + * Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- William Grant Sun, 06 May 2007 11:32:36 +1000 + maxima (5.12.0-1) unstable; urgency=low * New upstream release @@ -114,6 +175,13 @@ -- Camm Maguire Mon, 26 Mar 2007 15:37:26 -0400 +maxima (5.10.0-6ubuntu1) feisty; urgency=low + + * Merge from debian unstable. Remaining changes: + - Comment out backward-delete-char-untabify in maxima.el. + + -- William Alexander Grant Fri, 10 Nov 2006 20:47:20 +1100 + maxima (5.10.0-6) unstable; urgency=low * use normalized constants in f2cl-lib.lisp @@ -165,6 +233,32 @@ -- Camm Maguire Wed, 30 Aug 2006 14:09:14 -0400 +maxima (5.9.3-1.1ubuntu2) edgy; urgency=low + + * Rebuild with new gcl to fix socket problem with frontends. + + -- William Alexander Grant Tue, 3 Oct 2006 19:54:32 +1000 + +maxima (5.9.3-1.1ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + + -- Sarah Hobbs Tue, 22 Aug 2006 03:12:26 -0500 + +maxima (5.9.3-2) unstable; urgency=low + + * Build-depend on automake1.9, CLoses: #374663, Closes: #376656 + + -- Camm Maguire Wed, 30 Aug 2006 14:09:14 -0400 + +maxima (5.9.3-1ubuntu1) edgy; urgency=low + + * Re-sync with Debian + * Comment out backward-delete-char-untabify in maxima.el (Closes Malone #5273) + * debian/control: build-dep automake -> automake1.9 (Closes BTS: #374663) + + -- Barry deFreese Thu, 6 Jul 2006 17:04:52 -0400 + maxima (5.9.3-1) unstable; urgency=low * New upstream release @@ -1263 +1356,0 @@ - diff -u maxima-5.17.1/debian/maxima-doc.doc-base.plotting maxima-5.17.1/debian/maxima-doc.doc-base.plotting --- maxima-5.17.1/debian/maxima-doc.doc-base.plotting +++ maxima-5.17.1/debian/maxima-doc.doc-base.plotting @@ -8,2 +8,2 @@ -Index: /usr/share/doc/maxima-doc/plotting/maxima-gnuplot.html -Files: /usr/share/doc/maxima-doc/plotting/*.html +Index: /usr/share/doc/maxima-doc/plotting/maxima-gnuplot.shtml +Files: /usr/share/doc/maxima-doc/plotting/*.shtml diff -u maxima-5.17.1/debian/maxima-emacs.emacsen-install maxima-5.17.1/debian/maxima-emacs.emacsen-install --- maxima-5.17.1/debian/maxima-emacs.emacsen-install +++ maxima-5.17.1/debian/maxima-emacs.emacsen-install @@ -34,12 +34,12 @@ cd ${ELDIR} FILES=`echo *.el` -cp ${FILES} ${ELCDIR} cd ${ELCDIR} +ln -sf ${ELDIR}/*.el ${ELDIR}/*.lisp . cat << EOF > path.el (setq load-path (cons "." load-path) byte-compile-warnings nil) EOF ${FLAVOR} ${FLAGS} ${FILES} -rm -f *.el path.el +rm -f path.el exit 0 only in patch2: unchanged: --- maxima-5.17.1.orig/interfaces/emacs/emaxima/maxima.el +++ maxima-5.17.1/interfaces/emacs/emaxima/maxima.el @@ -2494,7 +2494,7 @@ (define-key map "\C-c\)" 'maxima-check-parens) (define-key map [(control c) (control \))] 'maxima-check-form-parens) ; (define-key map "\C-cC-\)" 'maxima-check-form-parens) - (define-key map "\177" 'backward-delete-char-untabify) +; (define-key map "\177" 'backward-delete-char-untabify) (setq maxima-mode-map map))) ;;;; Menu @@ -3321,7 +3321,7 @@ (define-key inferior-maxima-mode-map [(meta control tab)] 'inferior-maxima-input-complete) (define-key inferior-maxima-mode-map "\e\t" 'inferior-maxima-complete) -(define-key inferior-maxima-mode-map "\177" 'backward-delete-char-untabify) +;(define-key inferior-maxima-mode-map "\177" 'backward-delete-char-untabify) (define-key inferior-maxima-mode-map "\C-c\C-k" 'maxima-stop) (define-key inferior-maxima-mode-map "\C-c\C-d" maxima-help-map)