Bug#479100: Fix for this bug: for testing-proposed-updates

2008-10-10 Thread Kumar Appaiah
tags 474909 + patch
tags 479100 + patch

Dear Camm,

Please find attached a patch against the Lenny version to fix the two
bugs mentioned. Please consider uploading this to
testing-proposed-updates, so that it can be included in Lenny.

More testing of the patches may be advisable, though I am unsure.

Thanks.

Kumar
diff -u maxima-5.13.0/debian/rules maxima-5.13.0/debian/rules
--- maxima-5.13.0/debian/rules
+++ maxima-5.13.0/debian/rules
@@ -39,8 +39,8 @@
 
 	for i in aclocal.m4 src/sys-proclaim.lisp configure ; do [ -e $$i.ori ] || cp $$i $$i.ori; done
 
-	aclocal
-	automake
+	aclocal-1.9
+	automake-1.9
 
 	GCL_ANSI=t ./configure --enable-gcl $$(gcl -batch -eval '#-native-reloc(princ --enable-gcl-alt-link)(bye)') \
 		--prefix=/usr \
@@ -110,6 +110,8 @@
 			src/maxima.bat src/rmaxima maxima-local xmaxima-local maxima.spec maxima.iss
 	rm -rf src/numerical/slatec/fortran/CVS src/*gazonk* interfaces/xmaxima/win32/Makefile
 	for i in aclocal.m4 src/sys-proclaim.lisp configure ; do ! [ -e $$i.ori ] || mv $$i.ori $$i; done
+	rm -rf doc/info/maxima.html
+	rm -rf src/binary-gcl
 	dh_clean
 
 
@@ -216,6 +218,7 @@
 	dh_installemacsen -i
 	dh_installcron -i
 	dh_installman -i
+	dh_desktop -i
 	dh_installinfo -p maxima-doc debian/tmp/usr/share/info/*info*
 	dh_installchangelogs  -i
 	dh_link -i
@@ -238,6 +241,7 @@
 	dh_installemacsen -a
 	dh_installcron -a
 	dh_installman -a
+	dh_desktop -a
 	dh_installinfo -a
 	dh_installchangelogs  -a
 	dh_link -a
diff -u maxima-5.13.0/debian/maxima-doc.doc-base.tips maxima-5.13.0/debian/maxima-doc.doc-base.tips
--- maxima-5.13.0/debian/maxima-doc.doc-base.tips
+++ maxima-5.13.0/debian/maxima-doc.doc-base.tips
@@ -2,7 +2,7 @@
 Title: Debian Maxima Manual -- usage tips
 Author: Maxima development team -- http://sourceforge.net/projects/maxima
 Abstract: This manual documents various useful user interface features of maxima.
-Section: Apps/Math
+Section: Science/Mathematics
 
 Format: HTML
 Index: /usr/share/doc/maxima-doc/tips/ui-tips.html
diff -u maxima-5.13.0/debian/control maxima-5.13.0/debian/control
--- maxima-5.13.0/debian/control
+++ maxima-5.13.0/debian/control
@@ -2,12 +2,12 @@
 Section: math
 Priority: optional
 Maintainer: Camm Maguire [EMAIL PROTECTED]
-Build-Depends: gcl ( = 2.6.7-36 ) , 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
+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.7.2
 
 Package: maxima
 Architecture: any
-Depends:  ${shlibs:Depends}, gnuplot-nox
+Depends:  ${shlibs:Depends}, gnuplot-x11
 Recommends: maxima-share, gv
 Suggests: texmacs, maxima-doc, wish
 Description: A computer algebra system -- base system
@@ -53,6 +53,7 @@
  This package contains a build integrity test suite.
 
 Package: maxima-doc
+Section: doc
 Architecture: all
 Depends:
 Replaces: maxima ( ${binary:Version})
@@ -87,7 +88,7 @@
  libraries. 
 
 Package: maxima-emacs
-Depends:  maxima (= ${binary:Version}), emacs22 | emacsen, emacsen-common (= 1.4.14), tetex-extra | texlive-base-bin
+Depends:  maxima (= ${binary:Version}), emacs22 | emacsen, emacsen-common (= 1.4.14), texlive-base-bin
 Architecture: all
 Replaces: maxima ( ${binary:Version})
 Description: A computer algebra system -- emacs interface
diff -u maxima-5.13.0/debian/maxima-doc.doc-base.plotting maxima-5.13.0/debian/maxima-doc.doc-base.plotting
--- maxima-5.13.0/debian/maxima-doc.doc-base.plotting
+++ maxima-5.13.0/debian/maxima-doc.doc-base.plotting
@@ -2,7 +2,7 @@
 Title: Debian Maxima Manual -- Plotting examples
 Author: Maxima development team -- http://sourceforge.net/projects/maxima
 Abstract: This manual documents the new gnuplot-based plotting features in maxima.
-Section: Apps/Math
+Section: Science/Mathematics
 
 Format: HTML
 Index: /usr/share/doc/maxima-doc/plotting/maxima-gnuplot.html
diff -u maxima-5.13.0/debian/changelog maxima-5.13.0/debian/changelog
--- maxima-5.13.0/debian/changelog
+++ maxima-5.13.0/debian/changelog
@@ -1,3 +1,21 @@
+maxima (5.13.0-3.1+lenny1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * build-dep texlive-latex-recommended
+  * build-dep latest gcl to get arm build
+  * debian/rules:
++ Run automake-1.9 and aclocal-1.9 in place of automake and aclocal.
++ Ensure removal of binary-gcl and maxima.html upon clean.
++ Run dh_desktop during install.
+  * Bug fix: maxima needs gnuplot-x11 to plot, thanks to
+[EMAIL PROTECTED]/a; (Closes: #479100). depend on gnuplot-x11
+  * Bug fix: No such file or directory, thanks to Lucas Nussbaum
+(Closes: #474909). Build-dep against latest gcl
+  * doc-base files quote Science/Mathematics
+as the section.
+
+ -- Kumar Appaiah [EMAIL 

Bug#479100: Fix for this bug: for testing-proposed-updates

2008-10-10 Thread Kumar Appaiah
tags 474909 + patch
tags 479100 + patch
thanks

In hindsight, these don't seem to be bugs any more. So I removed the
patch tags. Sorry for the noise, and hope to see maxima in Lenny.

Kumar



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]