Test suite: quilt: Provide Gbp-pq headers in our new patch test case

And expect dgit to honour them

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

diff --git a/tests/tests/quilt b/tests/tests/quilt
index 37cb8d188e10556d173e818a1bd96bfe15e823a2..a6f78cd70812fc1d2f9599bf0411344aa6f2e921 100755 (executable)
--- a/tests/tests/quilt
+++ b/tests/tests/quilt
@@ -40,7 +40,7 @@ git merge branch
 iteration
 
 diff <<END - debian/patches/series
 iteration
 
 diff <<END - debian/patches/series

-change-something-in-the-upstream-yml
+ups-topic/ups-yml

 spongiform-upstream-new-file-incl-change
 zorkmid-options-=-42
 END
 spongiform-upstream-new-file-incl-change
 zorkmid-options-=-42
 END

diff --git a/tests/worktrees/ruby-rails-3.2_test.tar b/tests/worktrees/ruby-rails-3.2_test.tar
index fe01878eafc20a755c6402962bd871229da4d425..85365feac4367322801b7c500eb2cc636680c864 100644 (file)
Binary files a/tests/worktrees/ruby-rails-3.2_test.tar and b/tests/worktrees/ruby-rails-3.2_test.tar differ