diff -Nru matplotlib-1.5.1~rc1/debian/changelog matplotlib-1.5.1/debian/changelog
--- matplotlib-1.5.1~rc1/debian/changelog 2016-03-20 10:02:35.000000000 +0000
+++ matplotlib-1.5.1/debian/changelog 2016-03-21 21:39:36.000000000 +0000
@@ -1,3 +1,25 @@
+matplotlib (1.5.1-1ubuntu1) xenial; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - Build-depend on language-pack-en-base instead of locales-all.
+ - Closes LP: #1559761
+
+ -- Barry Warsaw Mon, 21 Mar 2016 17:38:22 -0400
+
+matplotlib (1.5.1-1) unstable; urgency=medium
+
+ [ Julian Taylor ]
+ * debian/tests/control: test against wxWidgets 3.0
+ - remove -dbg packages from wxagg test, not available anymore
+
+ [ Sandro Tosi ]
+ * New upstream release
+ * debian/control
+ - add ffmpeg to Suggests, Required for the animation module to be save out
+ put to movie formats
+
+ -- Sandro Tosi Sun, 07 Feb 2016 19:36:29 +0000
+
matplotlib (1.5.1~rc1-1ubuntu3) xenial; urgency=medium
* (cherry pick from Debian) Drop dbg packages from wxagg test deps,
@@ -998,7 +1020,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.5.1~rc1/debian/control matplotlib-1.5.1/debian/control
--- matplotlib-1.5.1~rc1/debian/control 2016-03-20 09:58:48.000000000 +0000
+++ matplotlib-1.5.1/debian/control 2016-03-20 22:41:10.000000000 +0000
@@ -95,6 +95,7 @@
python-tk (>= 2.5.2-1.1)
Enhances: ipython
Suggests: dvipng,
+ ffmpeg,
gir1.2-gtk-3.0,
ghostscript,
inkscape,
@@ -139,6 +140,7 @@
python3-tk
Enhances: ipython3
Suggests: dvipng,
+ ffmpeg,
gir1.2-gtk-3.0,
ghostscript,
inkscape,
diff -Nru matplotlib-1.5.1~rc1/debian/.git-dpm matplotlib-1.5.1/debian/.git-dpm
--- matplotlib-1.5.1~rc1/debian/.git-dpm 2016-01-09 18:46:00.000000000 +0000
+++ matplotlib-1.5.1/debian/.git-dpm 2016-03-20 22:41:11.000000000 +0000
@@ -1,11 +1,11 @@
# see git-dpm(1) from git-dpm package
-6e26b84f9c1de9ac768f94070d36ae381af20bda
-6e26b84f9c1de9ac768f94070d36ae381af20bda
-6d82424219d3a4cd0abb56028b7aefe94074d759
-6d82424219d3a4cd0abb56028b7aefe94074d759
-matplotlib_1.5.1~rc1.orig.tar.gz
-0876ac5b477c2018ec808ff8b177b5fffa88bfff
-53376942
+cd9e4deee40f7ad808664b115c382b176b5b9036
+cd9e4deee40f7ad808664b115c382b176b5b9036
+0ef98e60d02b0531d7a73a18c4af0ef0adf2a3ce
+0ef98e60d02b0531d7a73a18c4af0ef0adf2a3ce
+matplotlib_1.5.1.orig.tar.gz
+7a2e307bb9898893d4ff38f8f129cfa9dfe5ac92
+53375325
debianTag="debian/%e%v"
patchedTag="patched/%e%v"
upstreamTag="upstream/%e%u"
diff -Nru matplotlib-1.5.1~rc1/debian/patches/0005-bts800803-disable-the-GitHub-Fork-Me-ribbon.patch matplotlib-1.5.1/debian/patches/0005-bts800803-disable-the-GitHub-Fork-Me-ribbon.patch
--- matplotlib-1.5.1~rc1/debian/patches/0005-bts800803-disable-the-GitHub-Fork-Me-ribbon.patch 2016-01-09 18:46:00.000000000 +0000
+++ matplotlib-1.5.1/debian/patches/0005-bts800803-disable-the-GitHub-Fork-Me-ribbon.patch 2016-03-20 22:41:11.000000000 +0000
@@ -1,4 +1,4 @@
-From 0131130ce28b1525341bd86c487112ba6560c7cc Mon Sep 17 00:00:00 2001
+From 74ae8c3f8154334cafd4a295297717a8b1ff1e55 Mon Sep 17 00:00:00 2001
From: Sandro Tosi
Date: Sat, 9 Jan 2016 15:49:51 +0000
Subject: bts800803 disable the GitHub Fork Me ribbon
@@ -8,10 +8,10 @@
1 file changed, 6 deletions(-)
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
-index cb193d0..70f1b99 100644
+index 0a72bb0..9584bcb 100644
--- a/doc/_templates/layout.html
+++ b/doc/_templates/layout.html
-@@ -188,12 +188,6 @@ color: #11557C;">new updates
+@@ -171,12 +171,6 @@ color: #11557C;">new updates
diff -Nru matplotlib-1.5.1~rc1/debian/patches/0006-bts800803-dont-use-the-Raleway-font-from-the-Google-.patch matplotlib-1.5.1/debian/patches/0006-bts800803-dont-use-the-Raleway-font-from-the-Google-.patch
--- matplotlib-1.5.1~rc1/debian/patches/0006-bts800803-dont-use-the-Raleway-font-from-the-Google-.patch 2016-01-09 18:46:00.000000000 +0000
+++ matplotlib-1.5.1/debian/patches/0006-bts800803-dont-use-the-Raleway-font-from-the-Google-.patch 2016-03-20 22:41:11.000000000 +0000
@@ -1,4 +1,4 @@
-From 94e09e2cb6d51f4a9ef77d76b95586744de1b6a4 Mon Sep 17 00:00:00 2001
+From 50f3ffa36218b176be6d9625ddc3e296255b422c Mon Sep 17 00:00:00 2001
From: Sandro Tosi
Date: Sat, 9 Jan 2016 16:03:45 +0000
Subject: bts800803 dont use the Raleway font (from the Google Fonts API)
@@ -8,14 +8,14 @@
1 file changed, 1 deletion(-)
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
-index 70f1b99..e17db11 100644
+index 9584bcb..27ddde0 100644
--- a/doc/_templates/layout.html
+++ b/doc/_templates/layout.html
-@@ -170,7 +170,6 @@ parents[-1].link|e }}" />
- {%- endif %}
+@@ -154,7 +154,6 @@ parents[-1].link|e }}" />
{%- endblock %}
{%- block extrahead %} {% endblock %}
--
+-
+ Sphinx {{ sphinx_version }}.{% endtrans %}
+@@ -231,16 +231,6 @@ href="http://sphinx-doc.org/">Sphinx {{ sphinx_version }}.{% endtrans %}
{%- endblock %}
@@ -26,4 +26,5 @@
-
-
-