Please merge matplotlib 0.98.3-3 from Debian/unstable

Here is a debdiff to matplotlib 0.98.1-1 from Debian/unstable.

You can grab the Debian source package from PTS: http://packages.qa.debian.org/m/matplotlib.html

If you download the files and run

dpkg-source -x matplotlib_0.98.1-1.dsc
cd matplotlib-0.98.1/
patch -Np1 < ../matplotlib_0.98.1-1ubuntu1.debdiff

then you have to remove the hidden directory .pc from source folder. patch only removes the content of the files instead of deleting the files in .pc.

We have to check if matplotlib works without python-configobj and python-enthought-traits installed. Maybe we can change the toolkit dependencies to recommendations, because they are optional. This should be discussed with the Debian maintainer. Quote from upstream homepage: "matplotlib requires at a minimum python 2.3, numpy, freetype and libpng. To get the most out of matplotlib, you will want to build some of the optional GUI and image extensions, discussed below."

matplotlib (0.98.1-1ubuntu1) intrepid; urgency=low

  * Merge from Debian unstable (LP: #246408, #246239). Remaining Ubuntu changes:
    - debian/control:
      - Change Maintainer/XSBC-Original-Maintainer field,
      - Update Build-depends: python-wxgtk2.6 -> 2.8
      - Change order of dependencies so python-gtk2 is first.
    - debian/docs: adding various doc files to binary package
    - Revert to TkAgg backend instead of GTKAgg which has been the default
      in the several last Ubuntu releases. TkAgg is also the default backend
      in the Debian version.
    - debian/rules:
      - copy debian/setup.cfg to $(CURDIR), to make TkAgg the default.
      - call dh_link for the indep target.
    - Install /usr/share/matplotlib/matplotlib.conf and create
      a link from /etc/matplotlibrc to /usr/share/matplotlib.
    - debian/README.debian: add note on use of environmental variable.
  * debian/control:
    - Added python-pkg-resources to build dependency for version detection of
      python-enthought-traits
    - Moved dvipng from depends to recommends, because dvipng is an optional
      usetex dependency.
    - Moved python-configobj, python-enthought-traits (>= 2.0) from depends to
      suggests, becauste they are experimental config package dependencies.

 -- Benjamin Drung <email address hidden> Sun, 20 Jul 2008 01:31:03 +0200

Any progress towards talking with Debian? They're at 0.98.3-2 now. I've requested a sync of sphinx which is needed for the newer matplotlib. Once that's done we should be ready to go for a merge.

I will mail my changes to Debian. Some of the changes are also needed in Debian (e.g. FTBFS on i386). Thanks Jordan for helping to get sphinx into archive. I going to add this version to my PPA for hardy.

matplotlib (0.98.3-2ubuntu1) intrepid; urgency=low

  * Merge from Debian unstable (LP: #246408, #246239). Remaining Ubuntu changes:
    - debian/control:
      - Change Maintainer/XSBC-Original-Maintainer field,
      - Update Build-depends: python-wxgtk2.6 -> 2.8
      - Change order of dependencies so python-gtk2 is first.
    - debian/docs: adding various doc files to binary package
    - Revert to TkAgg backend instead of GTKAgg which has been the default
      in the several last Ubuntu releases. TkAgg is also the default backend
      in the Debian version.
    - debian/rules:
      - copy debian/setup.cfg to $(CURDIR), to make TkAgg the default.
      - call dh_link for the indep target.
    - Install /usr/share/matplotlib/matplotlib.conf and create
      a link from /etc/matplotlibrc to /usr/share/matplotlib.
    - debian/README.debian: add note on use of environmental variable.
  * debian/control:
    - Added python-pkg-resources to build dependency for version detection of
      python-enthought-traits
    - Moved dvipng from depends to recommends, because dvipng is an optional
      usetex dependency.
    - Moved python-configobj, python-enthought-traits (>= 2.0) from depends to
      suggests, becauste they are experimental config package dependencies.
  * debian/rules: Fix FTBFS on i386 because of an wrong platform string

 -- Benjamin Drung <email address hidden> Sun, 10 Aug 2008 20:39:07 +0200

Updated debdiff for version 0.98.3-3:

matplotlib (0.98.3-3ubuntu1) intrepid; urgency=low

  * Merge from Debian unstable (LP: #246408, #246239). Remaining Ubuntu changes:
    - debian/control:
      - Change Maintainer/XSBC-Original-Maintainer field,
      - Update Build-depends: python-wxgtk2.6 -> 2.8
      - Change order of dependencies so python-gtk2 is first.
    - debian/docs: adding various doc files to binary package
    - Revert to TkAgg backend instead of GTKAgg which has been the default
      in the several last Ubuntu releases. TkAgg is also the default backend
      in the Debian version.
    - debian/rules: copy debian/setup.cfg to $(CURDIR), to make TkAgg the
      default.
    - Install /usr/share/matplotlib/matplotlib.conf and create
      a link from /etc/matplotlibrc to /usr/share/matplotlib.
    - debian/README.debian: add note on use of environmental variable.
  * debian/control:
    - Added python-pkg-resources to build dependency for version detection of
      python-enthought-traits
    - Moved dvipng from depends to recommends, because dvipng is an optional
      usetex dependency.
    - Moved python-configobj, python-enthought-traits (>= 2.0) from depends to
      suggests, becauste they are experimental config package dependencies.
  * Corrected offset in matplotlibrc_fix.patch

 -- Benjamin Drung <email address hidden> Sat, 16 Aug 2008 15:49:49 +0200

Jordan, Morten, William: do you think any of you could take a look at this, so we get it in before Feature Freeze?

This bug was fixed in the package matplotlib - 0.98.3-3ubuntu1

---------------
matplotlib (0.98.3-3ubuntu1) intrepid; urgency=low

  * Release in collaboration with Benjamin Drung, from Ubuntu
  * debian/control
    - applied Benjamin Drung patch to split dep fields a package per line;
      thanks to him; Closes: #495287
    - replaced dep on python-dev with python; thanks to Benjamin Drung for the
      notice
    - depends reorganization: dvipng moved to recommends (optional tex
      depends), python-configobj and python-enthought-traits to suggests
      (experimental support); Closes: #490992
    - added python-matplotlib-dbg package and python-all-dbg, python-numpy-dbg
      to build-dep
    - removed python-gd depends since no more needed
  * debian/README.debian
    - removed outdated info, added notice for MATPLOTLIBDATA env variable
  * debian/python-matplotlib-data.install
    - added matplotlib.conf installation
  * debian/patches/matplotlibrc_fix.patch
    - refreshed to match new upstream code
  * debian/rules
    - added build, clean and install for -dbg package

  [Jordan Mantha]
  * Merging from Debian svn r6362 (Closes LP: #246408):
    - debian/control: use wxgtk2.8 instead of wxgtk2.6

 -- Jordan Mantha <email address hidden> Mon, 25 Aug 2008 10:05:00 -0700