changelog: Tidy up, preparatory to release

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

1 files changed, 44 insertions, 72 deletions

diff --git a/debian/changelog b/debian/changelog
index 259aaa1..a766e8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,80 +1,52 @@
 dgit (6.10~) unstable; urgency=medium
 
-  * changelog: start 6.10
-  * git-debrebase: trees_diff_walk: Refactor $all to \%opts
-  * git-debrebase: Fix get_tree's memoisation wrt $recurse (Closes: #907202)
-  * git-debrebase: trees_diff_walk: Support recursion
-  * git-debrebase: classify: Do not misclassify patches in subdirs
-    (Closes: #907206)
-  * test suite: Make example_1.1 contain a patch with Name and Topic
-  * git-debrebase: convert-from-*: snag on discarding comments in series
-    (Closes: #907198)
-  * test suite: gdr-import-nostitch: Test -fseries-comments
-  * git-debrebase: forget-was-ever-debrebase: New subcommand
-  * git-debrebase: test suite: gdr-subcommands: test forget
-  * git-debrebase: Do not try split brain gdr make-patches (Closes: #906908)
+  git-debrebase bugfixes:
+  * Patches in subdirectories: fix malfunctions.  Closes:#907202,#907206.
+  * new-upstream changelog entry: Use debchange.  Closes:#905888.
+  * Empty patch queues: Fix some malfunctions and infelicities.
+  * convert-to-gbp: Actually base the result on the breakwater, not HEAD.
+
+  dgit bugfixes:
+  * *build*: Cope with new-style --build= specifications
+  * Pass --no-source to sbuild (always).  Closes:#904966.
+  * build: Squash $buildproductsdir.  Closes:#906786.
+
+  dgit improvements for git-debrebase compatibility:
+  * Do not try split brain git-debrebase make-patches.  Closes:#906908.
+  * Do not abandon quilt fixup at git-debrebase split commits.
+  * Check for git-debrebase with a history walker, not debrebase-last.
+    This can avoids using dpkg-source --commit.  Closes:#907208.
+
+  git-debrebase improvements:
+  * convert-from-*: snag on discarding comments in series.  Closes:#907198.
+  * forget-was-ever-debrebase: New subcommand.
+  * Make all commit message annotations have a COMMIT-TYPE.
+
+  git-debrebase documentation:
+  * dgit-maint-debrebase(7): Add runes for inspecting.  Closes:#907190.
   * git-debrebase(5): Warn against renaming branch while unstitched
-  * test-suite: lib-gdr: Be more defensive about unexpected states/args
-  * test suite: lib-gdr: Check that we made patches with gdr
-  * git-debrebase: Make all commit annotations have a COMMIT-TYPE
-  * git-debrebase: Do not abandon quilt fixup at gdr split commits
-  * dgit: Introduce get_tree_of_commit
-  * test suite: gdr-diverge-nmu-dgit: Tolerate gdr-generated patches
-  * dgit: Replace branch_is_gdr with a history walker (Closes: #907208)
-  * test suite: Honour DGIT_TEST_RUN_PFX env var
-  * test suite: gdr-diverge-nmu-dgit: Insist on gdr-generated patches
-  * test suite: Test dgit detection of fresh branch for gdr make-patches
-  * test suite: Test dgit branch_is_gdr walker on a merge resolution
-  * test suite: Separate t-gdr-gbp-import-core from -with-queue
-  * dgit: branch_is_gdr: Put gdr commit annotations in alphabetical order
-  * git-debrebase: gbp_pq_export: Return flag, are there any patches?
-  * git-debrebase: make_patches_staged: Return flag, are there any patches?
-  * git-debrebase: convert-to-gbp: Actually start from breakwater
-  * git-debrebase: convert-to-gbp: Handle no-patches case better
-  * git-debrebase: keycommits: Fix doc comment
-  * git-debrebase: make-patches: Handle case when there are no patches
-  * git-debrebse: merge handling: Handle absence of patches via $any
-  * test suite: Test dgit calling git-debrebase on new debianisation
-  * dgit: branch_is_gdr: Add a cautionary comment
   * git-debrebase(5): Document new understanding of debrebase-last
-  * test suite: gdr-fresh: Drop use of git-deborig and fix dependencies
-  * test suite: test-list-uptodate: Drop imports and dependencies
+
+  test suite behavioural changes for ad-hoc runs:
+  * run-all: Without --progressive, rm and recreate tests/tmp
+  * run-all: Honour DGIT_TESTS_TMPDIR
+  * run-all: Understand `:' specially
+
+  test suite:
+  * Tests for the bugfixes and improvements.
+  * lib-gdr: Be more defensive about unexpected states/args
+  * lib-gdr: Check that we made patches with git-debrebase
+  * Honour DGIT_TEST_RUN_PFX env var.
+  * Test dgit calling git-debrebase on new debianisation.
+  * gdr-new-upstream: Check changelog is exactly right.
+  * debchange: Widespread better handling of the time seen by dch.
+    Freeze time.  Work around faketime TZ bug (#907264).
+  * test-list-uptodate: Drop imports and dependencies
   * git-debrebase: gdr-merge-conflicts: Call git merge --no-edit
-  * test suite: gdr-new-upstream: Check changelog is exactly right
-  * test suite: Provide tstunt/debchange
-  * git-debrebase: Prepare for calling debchange
-  * test suite: gdr-newupstream: Add more dividers
-  * test suite: gdr-new-upstream: Use new branch rather than reset
-  * test suite: gdr-new-upstream: Break out clog-check-[12]
-  * test suite: dch: Always use tstunt/debchange
-  * test suite: debchange: Freeze time
-  * test suite: debchange: Work around faketime TZ bug
-  * test suite: Update date to one with nontrivial DST in Europe/London
-  * git-debrebase: Use debchange for new-upstream changelog entry
-    (Closes: #905888)
-  * test suite: gdr-new-upstream: Test updating existing clog entry
-  * dgit-maint-debrebase(7): Add runes for inspecting history (Closes: #907190)
-  * test suite: lib-gdr: Factor out t-make-orig
-  * git-debrebase: t-make-orig: Pass -1 to gzip
-  * test suite: gdr-fresh: use t-make-orig
-  * test suite: gdr-makepatches7: use t-make-orig
-  * test suite: Work if $tmp is on a different filesystem.
-  * test suite: run-all: Without --progressive, rm and recreate tests/tmp
-  * test suite: run-all: Honour DGIT_TESTS_TMPDIR
-  * test suite: run-all: Move setting of TESTSCRIPTS
-  * test suite: run-all: Understand `:' specially
-  * gdr-fresh: Honour $bpd
-  * test suite: sbuild-gitish: Do not use build-products-dir
-  * test suite: build-products-dir: Check nothing in ../
-  * test suite: break out build-modes-source
-  * dgit: build: Squash $buildproductsdir (Closes: #906786)
-  * test suite: Test dgit build with bpd
-  * test suite: tstunt debchange: Use exec
-  * test suite: build-modes-*: Provide stunt dpkg-deb to pass -Znone
-  * dgit: build-*: Cope with new-style --build= specifications
-  * test suite: Test dgit build --build=
-  * dgit: Pass --no-source to sbuild (always) (Closes: #904966)
-  * changelog: Run gbp-dch
+  * build-modes-*: Provide stunt dpkg-deb to pass -Znone, for speed.
+  * build-products-dir: Check nothing in ../
+  * Work if $tmp is on a different filesystem.
+  * Internal changes and refactoring to support other changes.
 
  --