sbuild: Rename the used-up .changes files to `.inmulti'

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 697fae88e1141c3441f9a11466de0c302cc27809..a9c6e9e435457cb443e8a2cbb00daed025674008 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,12 @@ dgit (1.5~~) unstable; urgency=medium
     has been changed recently and now this default setting is very awkward
     to change for the dgit user.
 
+  New checks and improved behaviours:
+  * In dgit sbuild, check that the set of .changes files found is as we
+    expect, before calling mergechanges, and rename the used-up .changes
+    files to `.inmulti' to avoid accidental use of the wrong one (by
+    software, or by users).
+
   Bugfixes:
   * When cleaning up after failed clone, stat the to-be-cleaned-up
     directory before running rmtree on it.  Closes:#796773.
@@ -27,6 +33,11 @@ dgit (1.5~~) unstable; urgency=medium
   * Set GIT_COMMITTER_DATE and GIT_AUTHOR_DATE and increment them
     explicitly in drs-push-rejects test.  This avoids date dependencies
     which can cause that test to fail on fast computers.
+  * Remove some spurios .debs from the example_1.0.tar.
+  * Increase sqlite_busy_timeout in debpolicy-dbretry, because
+    zealot is very slow and we need to give the other processes time
+    to rollback and release the lock.
+  * Test quilt single-debian-patch.
 
  --