Control: tags 924650 + pending
Dear maintainer,
I've prepared an NMU for epsilon (versioned as 0.7.1-1.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
Regards.
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 <t...@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
