[Python-modules-commits] r5756 - in packages/matplotlib/trunk/debian (4 files)

[morph-guest at users.alioth.debian.org]

    Date: Sunday, June 29, 2008 @ 21:42:51
  Author: morph-guest
Revision: 5756

new upstream release; build & install doc; suggests python-scipy

Modified:
  packages/matplotlib/trunk/debian/TODO.debian
  packages/matplotlib/trunk/debian/changelog
  packages/matplotlib/trunk/debian/control
  packages/matplotlib/trunk/debian/rules

Modified: packages/matplotlib/trunk/debian/TODO.debian
===================================================================
--- packages/matplotlib/trunk/debian/TODO.debian	2008-06-29 18:39:58 UTC (rev 5755)
+++ packages/matplotlib/trunk/debian/TODO.debian	2008-06-29 21:42:51 UTC (rev 5756)
@@ -1,2 +1 @@
 - add -dbg package
-- build doc & ship it

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2008-06-29 18:39:58 UTC (rev 5755)
+++ packages/matplotlib/trunk/debian/changelog	2008-06-29 21:42:51 UTC (rev 5756)
@@ -1,3 +1,18 @@
+matplotlib (0.98.2-1) UNRELEASED; urgency=low
+
+  * DO NOT RELEASE!!! doc generation is still too hackish
+
+  * New upstream release
+  * debian/control
+    - added python-sphinx, graphviz, ipython, texlive-latex-extra build-deps
+      in order to build documentation
+    - added Suggests on python-scipy; thanks to Chris Walker for the report;
+      Closes: #488138
+  * debian/rules
+    - build and install documentation; Closes: #401629
+
+ -- Sandro Tosi <matrixhasu at gmail.com>  Sun, 29 Jun 2008 23:43:00 +0200
+
 matplotlib (0.98.1-1) unstable; urgency=low
 
   * New upstream release; Closes: #486074

Modified: packages/matplotlib/trunk/debian/control
===================================================================
--- packages/matplotlib/trunk/debian/control	2008-06-29 18:39:58 UTC (rev 5755)
+++ packages/matplotlib/trunk/debian/control	2008-06-29 21:42:51 UTC (rev 5756)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Marco Presi (Zufus) <zufus at debian.org>, Alexandre Fayolle <afayolle at debian.org>, Vittorio Palmisano <redclay81 at gmail.com>, Ondrej Certik <ondrej at certik.cz>, Sandro Tosi <matrixhasu at gmail.com>
-Build-Depends: debhelper (>= 5.0.38), python-dateutil, python-all-dev (>= 2.3.5-7), python-central (>= 0.5.6), quilt, python-gtk2-dev, python-numpy (>= 1:1.1.0), libgtk2.0-dev, libfreetype6-dev, zlib1g-dev, libpng-dev, tk8.4-dev, python-tk, tcl8.4-dev, python-epydoc, python-tz, dvipng, python-configobj, python-enthought-traits (>= 2.0), python-qt-dev, python-qt4-dev, python-wxgtk2.6
+Build-Depends: debhelper (>= 5.0.38), python-dateutil, python-all-dev (>= 2.3.5-7), python-central (>= 0.5.6), quilt, python-gtk2-dev, python-numpy (>= 1:1.1.0), libgtk2.0-dev, libfreetype6-dev, zlib1g-dev, libpng-dev, tk8.4-dev, python-tk, tcl8.4-dev, python-epydoc, python-tz, dvipng, python-configobj, python-enthought-traits (>= 2.0), python-qt-dev, python-qt4-dev, python-wxgtk2.6, python-sphinx (>= 0.4), graphviz, ipython, texlive-latex-extra
 XS-Python-Version: all
 Standards-Version: 3.8.0
 XS-DM-Upload-Allowed: yes
@@ -17,7 +17,7 @@
 Conflicts: python2.4-matplotlib
 Replaces: python2.4-matplotlib
 Enhances: ipython
-Suggests: ipython (>= 0.6.3), python-matplotlib-doc, texlive-extra-utils, texlive-latex-extra
+Suggests: ipython (>= 0.6.3), python-matplotlib-doc, texlive-extra-utils, texlive-latex-extra, python-scipy
 Description: Python based plotting system in a style similar to Matlab
  Matplotlib is a pure Python plotting library designed to bring
  publication quality plotting to Python with a syntax familiar to

Modified: packages/matplotlib/trunk/debian/rules
===================================================================
--- packages/matplotlib/trunk/debian/rules	2008-06-29 18:39:58 UTC (rev 5755)
+++ packages/matplotlib/trunk/debian/rules	2008-06-29 21:42:51 UTC (rev 5756)
@@ -20,6 +20,10 @@
 build-indep: build-indep-stamp
 build-indep-stamp:
 	dh_testdir
+
+	# build the doc
+	-( cd doc ; rm pyplots/tex_unicode_demo.py ; MATPLOTLIBDATA=../lib/matplotlib/mpl-data/ PYTHONPATH=../build/lib.linux-x86_64-2.5/ ./make.py )
+
 	touch build-indep-stamp
 
 build-arch:$(PYVERS:%=build-stamp-%)
@@ -42,6 +46,9 @@
 
 	rm -f lib/matplotlib/mpl-data/matplotlib.conf lib/matplotlib/mpl-data/matplotlibrc
 
+	# clean the doc
+	( cd doc ; ./make.py clean )
+
 	dh_clean
 
 # install
@@ -76,7 +83,7 @@
 	dh_testdir -i
 	dh_testroot -i
 	dh_installchangelogs -i CHANGELOG
-	dh_installdocs -p$(pd) -i
+	dh_installdocs -p$(pd) -i doc/build/html/ doc/build/latex/Matplotlib.pdf
 	dh_installexamples -p$(pd) -i examples/*
 	dh_compress -i -Xexamples -Xexamples/data -Xpdf
 	dh_fixperms -i