diff -Nru guilt-0.36/debian/changelog guilt-0.36/debian/changelog --- guilt-0.36/debian/changelog 2016-01-18 11:02:29.000000000 +0000 +++ guilt-0.36/debian/changelog 2016-03-16 01:46:47.000000000 +0000 @@ -1,3 +1,9 @@ +guilt (0.36-0.2ubuntu2) xenial; urgency=medium + + * fix-060.patch: Adjust filter_dd() and t-060 output for the newer dd. + + -- Adam Conrad Tue, 15 Mar 2016 19:45:47 -0600 + guilt (0.36-0.2ubuntu1) xenial; urgency=high * Merge from Debian unstable. Remaining changes: diff -Nru guilt-0.36/debian/patches/fix-060.patch guilt-0.36/debian/patches/fix-060.patch --- guilt-0.36/debian/patches/fix-060.patch 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.36/debian/patches/fix-060.patch 2016-03-16 01:47:13.000000000 +0000 @@ -0,0 +1,25 @@ +Description: Adjust filter_dd() and t-060 output for the newer dd. +Author: Adam Conrad + +--- guilt-0.36.orig/regression/scaffold ++++ guilt-0.36/regression/scaffold +@@ -46,7 +46,7 @@ function replace_path + + function filter_dd + { +- sed -e 's:^\([0-9]*\) bytes (\([0-9]*\.[0-9]* .B\)) copied.*$:\1 bytes (\2) copied:' ++ sed -e 's:^\(.*copied\).*$:\1:' + } + + # usage: cmd .. +--- guilt-0.36.orig/regression/t-060.out ++++ guilt-0.36/regression/t-060.out +@@ -54,7 +54,7 @@ mode + % dd if=/dev/zero of=file.bin bs=1 count=1024 + 1024+0 records in + 1024+0 records out +-1024 bytes (1.0 kB) copied ++1024 bytes (1.0 kB, 1.0 KiB) copied + % guilt files + def + % guilt files -v diff -Nru guilt-0.36/debian/patches/series guilt-0.36/debian/patches/series --- guilt-0.36/debian/patches/series 2016-01-18 11:02:40.000000000 +0000 +++ guilt-0.36/debian/patches/series 2016-03-16 01:46:54.000000000 +0000 @@ -5,3 +5,4 @@ guilt-tests-git-workaround.patch adt.patch fix-034-output.patch +fix-060.patch