[Python-modules-team] Bug#926911: unblock: epsilon/0.7.1-1.1

[Tobias Frost]

Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock

Please unblock package epsilon, the NMU fixes #924650

Debdiff attached.

unblock epsilon/0.7.1-1.1

-- System Information:
Debian Release: buster/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.19.0-4-amd64 (SMP w/8 CPU cores)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
-------------- next part --------------
diff -Nru epsilon-0.7.1/debian/changelog epsilon-0.7.1/debian/changelog
--- epsilon-0.7.1/debian/changelog	2015-10-10 17:43:41.000000000 +0200
+++ epsilon-0.7.1/debian/changelog	2019-04-06 12:38:25.000000000 +0200
@@ -1,3 +1,10 @@
+epsilon (0.7.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Apply patch from BTS to fix, thanks doko for the patch (Closes: #924650)
+
+ -- Tobias Frost <tobi at debian.org>  Sat, 06 Apr 2019 12:38:25 +0200
+
 epsilon (0.7.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru epsilon-0.7.1/debian/patches/kernel-4.18-diskstats.diff epsilon-0.7.1/debian/patches/kernel-4.18-diskstats.diff
--- epsilon-0.7.1/debian/patches/kernel-4.18-diskstats.diff	1970-01-01 01:00:00.000000000 +0100
+++ epsilon-0.7.1/debian/patches/kernel-4.18-diskstats.diff	2019-04-06 12:16:28.000000000 +0200
@@ -0,0 +1,13 @@
+--- a/epsilon/scripts/benchmark.py
++++ b/epsilon/scripts/benchmark.py
+@@ -46,6 +46,10 @@ def parseDiskStatLine(L):
+     appropriate record type (either L{partitionstat} or L{diskstat}).
+     """
+     parts = L.split()
++    # https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats
++    # ignore new diskstat values
++    if len(parts) == 18:
++        parts = parts[:-4]
+     device = parts[2]
+     if len(parts) == 7:
+         factory = partitionstat
diff -Nru epsilon-0.7.1/debian/patches/series epsilon-0.7.1/debian/patches/series
--- epsilon-0.7.1/debian/patches/series	2015-10-10 17:43:41.000000000 +0200
+++ epsilon-0.7.1/debian/patches/series	2019-04-06 12:16:28.000000000 +0200
@@ -1 +1,2 @@
 0001-Gracefully-handle-not-finding-working-directory.patch
+kernel-4.18-diskstats.diff