[Debian-astro-maintainers] Bug#822259: yt: diff for NMU version 3.2.1-2.1

[Tobias Frost]

Package: yt
Version: 3.2.1-2
Severity: normal
Tags: patch pending

Dear maintainer,

I've prepared an NMU for yt (versioned as 3.2.1-2.1). The diff
is attached to this message.

Regards.
diff -Nru yt-3.2.1/debian/changelog yt-3.2.1/debian/changelog
--- yt-3.2.1/debian/changelog	2015-10-28 12:23:30.000000000 +0100
+++ yt-3.2.1/debian/changelog	2016-04-22 17:47:45.000000000 +0200
@@ -1,3 +1,11 @@
+yt (3.2.1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Try to fix FTBFS. (Closes: #xxxxxx)
+  * Remove B-D on libpng (Closes: #810209)
+
+ -- Tobias Frost <tobi at debian.org>  Fri, 22 Apr 2016 15:12:08 +0200
+
 yt (3.2.1-2) unstable; urgency=low
 
   * Backport fix for mpl-1.5.
diff -Nru yt-3.2.1/debian/patches/series yt-3.2.1/debian/patches/series
--- yt-3.2.1/debian/patches/series	2015-10-28 12:17:17.000000000 +0100
+++ yt-3.2.1/debian/patches/series	2016-04-22 17:47:45.000000000 +0200
@@ -3,3 +3,4 @@
 artio_missing_depends.patch
 remove_reason.patch
 man-page.patch
+try-to-fix-ftbs.patch
diff -Nru yt-3.2.1/debian/patches/try-to-fix-ftbs.patch yt-3.2.1/debian/patches/try-to-fix-ftbs.patch
--- yt-3.2.1/debian/patches/try-to-fix-ftbs.patch	1970-01-01 01:00:00.000000000 +0100
+++ yt-3.2.1/debian/patches/try-to-fix-ftbs.patch	2016-04-22 17:47:45.000000000 +0200
@@ -0,0 +1,50 @@
+Description: <short description, required>
+ <long description that can span multiple lines, optional>
+Author: <name and email of author, optional>
+Origin: https://bitbucket.org/yt_analysis/yt/commits/069715baac70d5f0b186293b518eaf3802798370?at=yt
+ https://bitbucket.org/yt_analysis/yt/commits/3f7547299119397d1e2e2baa1d42f809aef21e35
+Bug: <URL to the upstream bug report if any, implies patch has been forwarded, optional>
+Bug-<Vendor>: <URL to the vendor bug report if any, optional>
+Forwarded: <URL|no|not-needed, useless if you have a Bug field, optional>
+Applied-Upstream: <version|URL|commit, identifies patches merged upstream, optional>
+Reviewed-by: <name and email of a reviewer, optional>
+Last-Update: <YYYY-MM-DD, last update of the meta-information, optional>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/yt/utilities/decompose.py
++++ b/yt/utilities/decompose.py
+@@ -69,7 +69,8 @@
+     temp = np.bincount(factors)
+     return np.array(
+         [(prime, temp[prime], (temp[prime] + 1) * (temp[prime] + 2) / 2)
+-         for prime in np.unique(factors)]
++         for prime in np.unique(factors)],
++        dtype=np.int64
+     )
+ 
+ 
+@@ -81,12 +82,12 @@
+     fac = factorize_number(pieces)
+     nfactors = len(fac[:, 2])
+     best = 0.0
+-    p_size = np.ones(3, dtype=np.int)
++    p_size = np.ones(3, dtype=np.int64)
+     if pieces == 1:
+         return p_size
+ 
+     while np.all(fac[:, 2] > 0):
+-        ldom = np.ones(3, dtype=np.int)
++        ldom = np.ones(3, dtype=np.int64)
+         for nfac in range(nfactors):
+             i = int(np.sqrt(0.25 + 2 * (fac[nfac, 2] - 1)) - 0.5)
+             k = fac[nfac, 2] - int(1 + i * (i + 1) / 2)
+--- a/yt/data_objects/tests/test_compose.py
++++ b/yt/data_objects/tests/test_compose.py
+@@ -20,7 +20,6 @@
+     yi = y / min_dx
+     zi = z / min_dx
+     index = xi + delta[0] * (yi + delta[1] * zi)
+-    index = index.astype('int64')
+     return index
+ 
+ def test_compose_no_overlap():