diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-20 14:52:22 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-20 14:52:23 +0100 |
commit | 04c1349ee97a40bcf44a5636f72811c33eae0ef7 (patch) | |
tree | 0725a42d57361828ea1b6a26c2316c8c46ca28b1 | |
parent | d8fe7d0a89ee7dd6531508bb0813588f867b245f (diff) |
test suite: Fix dependencies of new gdr-merge-conflicts test.debian/6.8archive/debian/6.8
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r-- | debian/changelog | 6 | ||||
-rwxr-xr-x | tests/tests/gdr-merge-conflicts | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 68348f8..37be210 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -dgit (6.8~) unstable; urgency=medium +dgit (6.8) unstable; urgency=medium - * + * test suite: Fix dependencies of new gdr-merge-conflicts test. - -- + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Mon, 20 Aug 2018 14:52:03 +0100 dgit (6.7) unstable; urgency=medium diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts index 660415d..1f3f09e 100755 --- a/tests/tests/gdr-merge-conflicts +++ b/tests/tests/gdr-merge-conflicts @@ -3,7 +3,7 @@ set -e autoimport= . tests/lib -t-dependencies NO-DGIT GDR +t-dependencies NO-DGIT GDR quilt t-tstunt-parsechangelog t-setup-import gdr-convert-gbp-noarchive |