changelog: rework for merging experimental tests into master

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

diff --git a/debian/changelog b/debian/changelog
index 5ba3e946a73e62eb2dabff3017a360c2a36a7c9b..b0a4401dfa83d7a6149b7ecf24552a6bea754193 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,27 +1,19 @@
+dgit (5.10~) unstable; urgency=medium
+ 
+  * Merge the experimental branch.
+ 
+ --
+ 
 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
-
   * 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