X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fchangelog;h=c9124067267678b606fc460212db8828238812e2;hb=0bb734e1ddc369763af4f00d73cbd8181757c66b;hp=1856ac4499d82ad7764108abfdb86e87d280bca2;hpb=aaa7434d8052c212f7e4063502eb2fef4b6d4214;p=dgit.git

diff --git a/debian/changelog b/debian/changelog
index 1856ac44..c9124067 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,52 @@
-dgit (9.9~) unstable; urgency=medium
+dgit (9.11~) unstable; urgency=medium
+
+  Bugfixes:
+  * git-debrebase, git-debpush: fail when looking for upstream tag if
+    there is more than one candidate.  Closes:#961682.  [Sean Whitton]
+  * git-debrebase: Fix error message for wrong use of -i
+  * git-debrebase: new-upstream: Do not treat late options as version
+
+  Documentation:
+  * dgit-maint-debrebase(7): Drop some bad advice about the upstream/ tag
+    case.  Closes:#961683.  [Sean Whitton]
+  * git-debrebase(1): Fix new-upstream -i docs
+
+  dgit-infrastructure:
+  * dgit-mirror-ssh-wrap: Cope with new rsync rune.  Closes:#963489.
+  * dgit-mirror-ssh-wrap: Clarify the error message 
+
+ Test suite:
+  * Cope with buster & eatmydata (ie, work around #963508)
+  * Provide navigation banner in log when exiting nonzero
+  * Print pwd in failure trap to help with diagnosis
+
+ --
+
+dgit (9.10) unstable; urgency=medium
+
+  dgit bugfix:
+  * Work around gbp metadata handling bug which can prevent import
+    of some anomalous source packages.  Closes:#950326.
+    Report from Peter Green.
+
+  git-debpush bugfix:
+  * avoid a pipefail problem.  Closes:#940588.  [Sean Whitton]
+
+  Documentation:
+  * Terminology: Change "rewind" to "rewrite" where appropriate
+  * dgit(1): Cover more cases of --overwrite and --deliberately
+    Closes:#928473.
+  * dgit(1): Do not talk about `intermediate' uploads.
+  * d-m-{merge,debrebase}(7): Use an 'upstream/' tag prefix in
+    gbp.conf; set `merge' in gbp.conf; import tarball before
+    committing gbp.conf.  Closes:#932954.  [Sean Whitton]
+
+  i18n:
+  * Updated nl.po file.  Closes:#945356.  [Frans Spiesschaert]
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 03 Feb 2020 08:41:10 +0000
+
+dgit (9.9) unstable; urgency=medium
 
   Documentation:
   * dgit-maint-{merge,debrebase}(7): Suggest a better rune.
@@ -19,7 +67,7 @@ dgit (9.9~) unstable; urgency=medium
   * lintian: Override some checks
   * control: Bump Standards-Version to 4.4.0.0.
 
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 14 Sep 2019 21:34:13 +0100
 
 dgit (9.8) unstable; urgency=medium