From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 20 Aug 2018 13:52:22 +0000 (+0100)
Subject: test suite: Fix dependencies of new gdr-merge-conflicts test.
X-Git-Tag: archive/debian/6.8^0
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=04c1349ee97a40bcf44a5636f72811c33eae0ef7

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 68348f87..37be2103 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 660415d9..1f3f09e0 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