[Python-modules-commits] r6103 - in packages/matplotlib/trunk/debian (changelog control rules)

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

    Date: Sunday, August 3, 2008 @ 21:29:35
  Author: morph-guest
Revision: 6103

upgrade to 0.98.3; build doc; symlink to jquery.js in libjs-jquery;

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

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2008-08-01 19:08:32 UTC (rev 6102)
+++ packages/matplotlib/trunk/debian/changelog	2008-08-03 21:29:35 UTC (rev 6103)
@@ -1,20 +1,22 @@
-matplotlib (0.98.2-1) UNRELEASED; urgency=low
+matplotlib (0.98.3-1) UNRELEASED; urgency=medium
 
-  * DO NOT RELEASE!!! doc generation is still too hackish
-
   * New upstream release
+    - fixed memory leaks; Closes: #492735 (RC bug, hence urgency=medium)
   * debian/control
-    - added python-sphinx, graphviz, ipython, texlive-latex-extra build-deps
-      in order to build documentation
+    - added python-sphinx (versioned to easy Lenny entrance), 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
     - added Vcs-{Browser,Svn} fields
+    - added depend on libjs-jquery to replace embedded one
   * debian/rules
     - build and install documentation; Closes: #401629
+    - symlinked jquery.js from libjs-jquery instead of the embedded one
+    - added dh_link -i call for indep packages
   * debian/watch
     - removed comment lines since not needed
 
- -- Sandro Tosi <matrixhasu at gmail.com>  Tue, 01 Jul 2008 19:38:21 +0200
+ -- Sandro Tosi <matrixhasu at gmail.com>  Sun, 03 Aug 2008 21:43:18 +0200
 
 matplotlib (0.98.1-1) unstable; urgency=low
 

Modified: packages/matplotlib/trunk/debian/control
===================================================================
--- packages/matplotlib/trunk/debian/control	2008-08-01 19:08:32 UTC (rev 6102)
+++ packages/matplotlib/trunk/debian/control	2008-08-03 21:29:35 UTC (rev 6103)
@@ -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, python-sphinx (>= 0.4), graphviz, ipython, texlive-latex-extra
+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.1-2+lenny1), graphviz, ipython, texlive-latex-extra
 XS-Python-Version: all
 Standards-Version: 3.8.0
 XS-DM-Upload-Allowed: yes
@@ -14,7 +14,7 @@
 Package: python-matplotlib
 Architecture: any
 XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, python-numpy (>= 1:1.1.0), python-tk, python-gd (>= 0.52) | python-gtk2 | python-wxgtk2.6 | python-qt3 | python-qt4, python-tz, python-dev, python-matplotlib-data (>= ${source:Version}), python-dateutil, python-gobject, ${shlibs:Depends}, dvipng, python-configobj, python-enthought-traits (>= 2.0), python-pyparsing, python-glade2, python-cairo, python-excelerator
+Depends: ${python:Depends}, python-numpy (>= 1:1.1.0), python-tk, python-gd (>= 0.52) | python-gtk2 | python-wxgtk2.6 | python-qt3 | python-qt4, python-tz, python-dev, python-matplotlib-data (>= ${source:Version}), python-dateutil, python-gobject, ${shlibs:Depends}, dvipng, python-configobj, python-enthought-traits (>= 2.0), python-pyparsing, python-glade2, python-cairo, python-excelerator, libjs-jquery
 Provides: ${python:Provides}
 Conflicts: python2.4-matplotlib
 Replaces: python2.4-matplotlib

Modified: packages/matplotlib/trunk/debian/rules
===================================================================
--- packages/matplotlib/trunk/debian/rules	2008-08-01 19:08:32 UTC (rev 6102)
+++ packages/matplotlib/trunk/debian/rules	2008-08-03 21:29:35 UTC (rev 6103)
@@ -22,9 +22,8 @@
 	dh_testdir
 
 	# build the doc
-	-( cd doc ; rm pyplots/tex_unicode_demo.py;\
-		MATPLOTLIBDATA=../lib/matplotlib/mpl-data/ \
-		PYTHONPATH=../build/lib.$(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)-$(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)-$(DEFPY) ./make.py )
+	-( cd doc ; MATPLOTLIBDATA=../lib/matplotlib/mpl-data/ \
+		    PYTHONPATH=../build/lib.$(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)-$(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)-$(DEFPY) ./make.py )
 
 	touch build-indep-stamp
 
@@ -51,6 +50,7 @@
 	( cd doc ; ./make.py clean )
 	rm -f doc/_static/inheritance*
 	rm -f doc/_static/math-*.png
+	rm -f doc/test.png
 	find . -name '*.pyc' -exec rm {} \;
 
 	dh_clean
@@ -89,7 +89,10 @@
 	dh_installchangelogs -i CHANGELOG
 	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_compress -i -Xexamples -Xexamples/data -Xpdf -X.js
+	ln -sf /usr/share/javascript/jquery/jquery.js \
+		$(CURDIR)/debian/$(pd)/usr/share/doc/python-matplotlib-doc/html/_static/jquery.js
+	dh_link -i
 	dh_fixperms -i
 	dh_installdeb -i
 	dh_gencontrol -i