X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Fchangelog;h=bae63cc36b3b798e0d2ade6f6fc569e0ced27537;hp=8873a89ee05fd636b5642092957bfa2b7920ee72;hb=6195748b77343d61f81ee4cdac2942fbbfcc3590;hpb=52eeb586a25be5734ab9e53059f41f5a6e08690c

diff --git a/debian/changelog b/debian/changelog
index 8873a89e..bae63cc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,24 +1,91 @@
-dgit (6.0~) unstable; urgency=medium
+dgit (6.3) unstable; urgency=medium
+
+  * git-debrebase: breakwater: Fix error message for unprocessable
+    commits.  Closes:#905003.
+  * git-debrebase: new-upstream: Fix error message for new version
+    with bad syntax.
+  * git-debrebase test suite: Test messages about unprocessable commits.
+  * git-debrebase: new-upstream: Fix handling of epochs.
+  * git-debrebase: convert-from-gbp: Use same algorithm for finding
+    upstream commitish as new-upstream.  Closes:#905062.
+  * git-debrebase: Improve error messages for bad options.
+  * git-debrebase: Improve error message for convert-from-gbp
+    upstream discrepancy.  Closes:#905078.
+  * git-debrebase(5): Add ILLEGAL OPERATIONS section.  (Re#905004.)
+  * git-debrebase(1): Warn against plain git rebase.  (Re#905004.)
+  * dgit-maint-debrebase(7): Warn more against plain git rebase.
+    Closes:#905004.
+  * git-debrebase: Implement --help, providing a summary.
+    Closes:#904990.
+
+ -- Ian Jackson <ian@zealot.relativity.greenend.org.uk>  Thu, 02 Aug 2018 03:45:40 +0100
+
+dgit (6.2) unstable; urgency=medium
+
+  * dgit(1): Improve and correct --build-products-dir description.
+  * dgit: Minor code cleanup.
+  * dgit build: Warn if --build-products-dir is not `..'.  Closes:#904859.
+  * test suite: Test dgit import-dsc --build-products-dir.
+
+  [Sean Whitton]
+  * manpages: alioth->salsa
+  * manpages: add references to pbuilder and cowbuilder
+  * dgit-maint-gbp(7): discuss dgit.default.build-products-dir
+  * dgit-maint-gbp(7): update references to --*-dirty
+  * dgit-sponsorship(7): add references to push-source
+  * dgit-maint-debrebase(7): fix command to just launder
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 29 Jul 2018 12:57:26 +0100
+
+dgit (6.1) unstable; urgency=medium
 
+  New feature:
+  * 'pbuilder' and 'cowbuilder' subcommands (Closes: #844125).
+    - Suggest sbuild | pbuilder | cowbuilder.
+
+  Minor fixes:
+  * Fix an error message to refer to the build products dir instead of
+    just the parent directory.
+
+ -- Sean Whitton <spwhitton@spwhitton.name>  Sat, 28 Jul 2018 20:14:23 +0800
+
+dgit (6.0) unstable; urgency=medium
+
+  New features [Sean Whitton]:
+  * Introduce dgit.default.build-products-dir git configuration key.
+    Closes:#857316.
+  * Die earlier, and with a more helpful message, if the user tries to
+    include dirty changes when building a source package in split brain
+    mode.
+
+  dgit behavioural changes:
+  * 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.
+  * dgit: Build source packages in a private directory, except when
+    the user passes --include-dirty [Sean Whitton].
+    - dgit push-source no longer cleans the tree [Sean Whitton].
+  * dgit: Rename --ignore-dirty to --include-dirty (leaving the old
+    name supported as a deprecated alias).
+
+  Test suite improvements:
   * test suite: unset VISUAL, which interferes.  Closes:#904308.
+  * Honour DGIT_SCHROOT_CHROOT to set the schroot to use for the sbuild
+    tests.
+  * Support tests/run-all --progressive.
+  * Drop now-obsolete *-asplit tests.
+
+  Other improvements:
   * 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 push-source no longer cleans the tree.
+  * Make --build-products-dir (and the new config key) actually work.
+    Closes:#863582.  [ Ian and Sean. ] 
+  * dgit: Many important internal rearrangemnts relating to source
+    package production and building.
 
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 26 Jul 2018 14:43:47 +0100
 
 dgit (5.10) unstable; urgency=medium