diff --git a/bzrlib/tests/test_diff.py b/bzrlib/tests/test_diff.py index 0811aca..bfa68b1 100644 --- a/bzrlib/tests/test_diff.py +++ b/bzrlib/tests/test_diff.py @@ -313,8 +313,8 @@ class TestDiffFiles(tests.TestCaseInTempDir): pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE) out, err = pipe.communicate() - # Diff returns '2' on Binary files. - self.assertEqual(2, pipe.returncode) + # Diff from diffutils >= 3.5 returns '1' on Binary files. + self.assertEqual(1, pipe.returncode) # We should output whatever diff tells us, plus a trailing newline self.assertEqual(out.splitlines(True) + ['\n'], lines) diff --git a/debian/control b/debian/control index 9d54e83..59245b0 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ Build-Depends: bash-completion, ca-certificates, cython-dbg | python-pyrex, debhelper (>= 9), + diffutils (>= 1:3.5), fdupes, python (>= 2.6.6-3), python-all-dbg (>= 2.6.6-3),