test suite: gdr-fresh: Drop use of git-deborig and fix dependencies

[dgit.git] / debian / tests / control

diff --git a/debian/tests/control b/debian/tests/control
index 8f7fd7d251825632c3e13e4063c489334f3e9686..51e00f4864c8ad18ec80ef7ee31d57a27dc9785e 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -16,7 +16,11 @@ Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc
 Restrictions: x-dgit-intree-only x-dgit-git-only
 
-Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-makepatches7 gdr-subcommands gdr-unprocessable
+Tests: gdr-merge-conflicts
+Tests-Directory: tests/tests
+Depends: chiark-utils-bin, git-debrebase, git-buildpackage, faketime, quilt
+
+Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-fresh gdr-import-dgit gdr-import-dgitview gdr-import-nostitch gdr-makepatches7 gdr-merge gdr-subcommands gdr-unprocessable gdr-unprocessable-hints
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, git-debrebase, git-buildpackage, faketime