summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rwxr-xr-xtests/tests/gdr-merge-conflicts2
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