diff -Nru matplotlib-1.0.1/debian/changelog matplotlib-1.0.1/debian/changelog --- matplotlib-1.0.1/debian/changelog 2011-05-07 11:14:27.000000000 +0200 +++ matplotlib-1.0.1/debian/changelog 2011-05-16 15:46:57.000000000 +0200 @@ -1,3 +1,12 @@ +matplotlib (1.0.1-2ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. Remaining changes: + - Drop python-qt-dev from build-depends and python-qt3 from + python-matplotlib suggests to support python-qt3 removal. Reflect + this in README.Debian. + + -- Julian Taylor Sun, 08 May 2011 07:25:16 +0100 + matplotlib (1.0.1-2) unstable; urgency=low * Upload to unstable @@ -50,6 +59,36 @@ -- Sandro Tosi Tue, 25 Jan 2011 18:17:56 +0100 +matplotlib (0.99.3-1ubuntu4) natty; urgency=low + + * add patch 70_search_new_tkdir.patch + + search in new path for tkConfig.sh, changed in tk 8.5.9-2 (LP: #752647) + + -- Julian Taylor Thu, 07 Apr 2011 21:12:50 +0200 + +matplotlib (0.99.3-1ubuntu3) natty; urgency=low + + [ Mike Droettboom ] + * debian/patches/40_UnicodeEncodeError.patch: Remove unicode from docstrings + since it doesn't play well with __builtin__.help(). (LP: #685710) + + -- Artur Rona Mon, 04 Apr 2011 21:24:28 +0200 + +matplotlib (0.99.3-1ubuntu2) natty; urgency=low + + * No change rebuild to pick up python2.7 + + -- Scott Kitterman Thu, 04 Nov 2010 13:21:26 -0400 + +matplotlib (0.99.3-1ubuntu1) maverick; urgency=low + + * Merge from debian unstable. Remaining changes: + - Drop python-qt-dev from build-depends and python-qt3 from + python-matplotlib suggests to support python-qt3 removal. Reflect + this in README.Debian. + + -- Andreas Wenning Fri, 25 Jun 2010 12:53:04 +0000 + matplotlib (0.99.3-1) unstable; urgency=low * New upstream release @@ -64,6 +103,14 @@ -- Sandro Tosi Tue, 22 Jun 2010 00:32:30 +0200 +matplotlib (0.99.1.2-3ubuntu1) lucid; urgency=low + + * Merge from Debian unstable, remaining changes: + - Drop python-qt-dev from build-depends and python-qt3 from + python-matplotlib suggests to support python-qt3 removal. + + -- Benjamin Drung Sat, 06 Feb 2010 18:38:21 +0100 + matplotlib (0.99.1.2-3) unstable; urgency=low [ Sandro Tosi ] @@ -81,6 +128,22 @@ -- Benjamin Drung Sat, 06 Feb 2010 09:34:01 +0100 +matplotlib (0.99.1.2-2ubuntu2) lucid; urgency=low + + * Drop python-qt-dev from build-depends and python-qt3 from + python-matplotlib suggests to support python-qt3 removal + - Update README.debian + + -- Scott Kitterman Tue, 26 Jan 2010 15:29:44 -0500 + +matplotlib (0.99.1.2-2ubuntu1) lucid; urgency=low + + * Merge from Debian unstable, remaining changes: + - Explicitly depend on python-tk as workaround for LP #301007; drop these + changes if an auto backend discovery is implemented by upstream. + + -- Benjamin Drung Mon, 28 Dec 2009 16:22:14 +0100 + matplotlib (0.99.1.2-2) unstable; urgency=low * Build depend on texlive-latex-recommended instead of latex-ucs to fix FTBFS @@ -92,6 +155,14 @@ -- Benjamin Drung Mon, 28 Dec 2009 15:57:32 +0100 +matplotlib (0.99.1.2-1ubuntu1) lucid; urgency=low + + * Merge from Debian unstable, remaining changes: + - Explicitly depend on python-tk as workaround for LP #301007; drop these + changes if an auto backend discovery is implemented by upstream. + + -- Benjamin Drung Sun, 15 Nov 2009 23:29:52 +0100 + matplotlib (0.99.1.2-1) unstable; urgency=low * New upstream release. @@ -101,6 +172,14 @@ -- Benjamin Drung Sun, 15 Nov 2009 22:17:31 +0100 +matplotlib (0.99.1.1-1ubuntu1) lucid; urgency=low + + * Merge from Debian unstable, remaining changes: + - Explicitly depend on python-tk as workaround for LP #301007; drop these + changes if an auto backend discovery is implemented by upstream. + + -- Benjamin Drung Sat, 14 Nov 2009 22:15:45 +0100 + matplotlib (0.99.1.1-1) unstable; urgency=low [ Sandro Tosi ] @@ -133,6 +212,14 @@ -- Benjamin Drung Sun, 08 Nov 2009 21:58:23 +0100 +matplotlib (0.99.0-1ubuntu1) karmic; urgency=low + + * Merge from Debian unstable (LP: #419885), remaining changes: + - Explicitly depend on python-tk as workaround for LP #301007; drop these + changes if an auto backend discovery is implemented by upstream. + + -- Benjamin Drung Fri, 18 Sep 2009 10:13:37 +0200 + matplotlib (0.99.0-1) unstable; urgency=low * New upstream release @@ -152,6 +239,15 @@ -- Sandro Tosi Wed, 15 Jul 2009 10:16:45 +0200 +matplotlib (0.98.5.3-1ubuntu1) karmic; urgency=low + + * Merge from Debian unstable (LP: #382467), remaining changes: + - Build with tcl/tk8.5 as python-tk was build with tcl/tk8.5. + * debian/control: Explicitly depend on python-tk as workaround for LP #301007; + drop these changes if an auto backend discovery is implemented by upstream. + + -- Benjamin Drung Mon, 01 Jun 2009 18:22:43 +0200 + matplotlib (0.98.5.3-1) unstable; urgency=low [ Benjamin Drung ] @@ -196,6 +292,28 @@ -- Sandro Tosi Fri, 29 May 2009 08:40:48 +0200 +matplotlib (0.98.5.2-1ubuntu3) jaunty; urgency=low + + * Install egg-info files and add python-setuptools to build depends; thanks to + Gediminas Paulauskas (LP: #298138). + * debian/control: Build depends on python-qt4 + + -- Benjamin Drung Wed, 25 Mar 2009 18:56:31 +0100 + +matplotlib (0.98.5.2-1ubuntu2) jaunty; urgency=low + + * Really build with tcl/tk8.5 as python-tk was build with tcl/tk8.5 + (LP: #337469). + + -- Andrew Straw Sat, 21 Mar 2009 14:55:09 -0700 + +matplotlib (0.98.5.2-1ubuntu1) jaunty; urgency=low + + * Python 2.6 transition (lp: #336234) + * Build with tcl/tk8.5 as python-tk was build with tcl/tk8.5. + + -- Michael Bienia Sun, 01 Mar 2009 18:30:05 +0100 + matplotlib (0.98.5.2-1) experimental; urgency=low [ Benjamin Drung ] @@ -577,7 +695,7 @@ * Depend on python-tz, remove the pytz files. Closes: #376715. -- Matthias Klose Fri, 7 Jul 2006 18:38:43 +0000 - + matplotlib (0.86.2-6) unstable; urgency=low * Added a note about numeric/numarray deps in README.debian. Closes: #376198 diff -Nru matplotlib-1.0.1/debian/control matplotlib-1.0.1/debian/control --- matplotlib-1.0.1/debian/control 2011-05-07 01:38:20.000000000 +0200 +++ matplotlib-1.0.1/debian/control 2011-05-16 15:45:41.000000000 +0200 @@ -1,7 +1,8 @@ Source: matplotlib Section: python Priority: optional -Maintainer: Debian Python Modules Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Python Modules Team Uploaders: Alexandre Fayolle , Sandro Tosi Build-Depends: debhelper (>= 7), @@ -66,7 +67,6 @@ python-excelerator, python-gtk2, python-matplotlib-doc, - python-qt3, python-qt4, python-scipy, python-traits (>= 2.0), diff -Nru matplotlib-1.0.1/debian/README.debian matplotlib-1.0.1/debian/README.debian --- matplotlib-1.0.1/debian/README.debian 2008-11-09 01:29:51.000000000 +0100 +++ matplotlib-1.0.1/debian/README.debian 2011-05-08 08:25:16.000000000 +0200 @@ -41,5 +41,5 @@ GTK+ -> python-gtk2 Tk -> python-tk - QT -> python-qt3 or python-qt4 + QT -> python-qt4 WX -> python-wxgtk2.6 or python-wxgtk2.8