test suite: Fix dependencies of new gdr-merge-conflicts test.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 68348f879d335d0187a7b1e8092d19aa4f42beeb..37be2103c00b3833a609acf20f84f35ce4a174fe 100644 (file)
--- 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 660415d9cb91ab56abb6db278588f476f912f854..1f3f09e0d1a6ec3336d0ed694b99be4c1e7f4128 100755 (executable)
--- 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