X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fchangelog;h=d4ce818d2b821646ed0d394bc839d24f98601c3a;hb=d7e20af364775278c1f7f2398c8debdb0af8fb40;hp=7f0c1ea36ad6bb86415e96406311354574568871;hpb=3aa2ab5f285a1675dece0cd3b4f594e94b7ecb9e;p=dgit.git

diff --git a/debian/changelog b/debian/changelog
index 7f0c1ea3..d4ce818d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,27 +1,42 @@
-dgit (5.9+exp4~) experimental; urgency=medium
-
-  * test suite: tar up the artifacts, and name the tarball after
-    the test (to work around #903696).
-
- -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 13 Jul 2018 11:38:25 +0100
-
-dgit (5.9+exp3) experimental; urgency=medium
-
-  * test suite: chmod a+r $AUTOPKGTEST explicitly.
-
- -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 13 Jul 2018 00:54:20 +0100
-
-dgit (5.9+exp2) experimental; urgency=medium
-
-  * test suite: Save things to $AUTOPKGTEST_ARTIFACTS without
-    preserving access control information.  Works around #903680.
-
- -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 13 Jul 2018 00:43:11 +0100
-
-dgit (5.9+exp1) experimental; urgency=medium
+dgit (6.0~) unstable; urgency=medium
+
+  * test suite: unset VISUAL, which interferes.  Closes:#904308.
+  * apt-get method: when apt does not update release files,
+    unconditionally print hint about noatime.  Closes:#851873.
+  * messages: Be a lot more friendly about NEW in particular,
+    and also add a couple of `please's.  Closes:#904448.
+  * dgit: Introduce dgit.default.build-products-dir git
+    configuration key.  Closes:#857316.  [ Sean Whitton. ]
+    Still does not always work, due to #863582.
+  * dgit: Minor internal improvements.
+  * dgit: Rename --ignore-dirty to --include-dirty (leaving the old
+    name supported as a deprecated alias).
+  * dgit: Always build the source package ourselves, rather than
+    sometimes leaving that to the builder command.  dgit will now
+    usually generate *_multi.changes rather than *_$arch.changes.
+  * test suite: Honour DGIT_SCHROOT_CHROOT to set the schroot to
+    use for the sbuild tests.
+
+ --
+
+dgit (5.10) unstable; urgency=medium
+ 
+  * Merge the experimental branch.
+  * test suite: Drop a couple of useless test log output lines.
+  * infrastructure: Run git gc --auto before mirroring.  Closes:#841414.
+ 
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 14 Jul 2018 18:07:02 +0100
+ 
+dgit (5.9+exp4) experimental; urgency=medium
 
   * test suite: Use  dch -r -D sid ''  not  dch -r sid.  Closes:#903441.
-  * test suite: Save much stuff to $AUTOPKGTEST_ARTIFACTS.
+  * test suite: Save a tarball of much of the working area of each test
+    in $AUTOPKGTEST_ARTIFACTS.
+  * Separate changelog entries for the following test attempts
+    in experimental have been elided:
+      dgit (5.9+exp3) experimental; urgency=medium
+      dgit (5.9+exp2) experimental; urgency=medium
+      dgit (5.9+exp1) experimental; urgency=medium
 
  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 12 Jul 2018 13:45:07 +0100