X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Fchangelog;h=0dd60cbc5be0aa4d7da4c98177fede3118906161;hp=e1c2c476d2b44bca3a9c80061f9a08b7566991c3;hb=ee92b10fcb1b04597421fbac76e85daa417aa4c9;hpb=a3de80aa64b5af73cd49c1479ee62e69c49b90d9

diff --git a/debian/changelog b/debian/changelog
index e1c2c476..0dd60cbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,33 @@
-dgit (4.1~) experimental; urgency=medium
+dgit (4.2~) experimental; urgency=medium
+
+  Documentation improvements:
+  * dgit-maint-merge(7): many updates.  [Sean Whitton]
+    Closes:#864873,#878433.
+
+  Minor fixes:
+  * Fix grammar error in 4.1 changelog entry. [Sean Whitton]
+  * Remove some whitespace "errors". [Sean Whitton]
+
+  Test suite:
+  * dpkgsourceignores-docs: Correct restriction (so autopkgtest
+    won't try to run it).
+
+ --
+
+dgit (4.1) experimental; urgency=medium
 
   Important improvements to dgit:
   * Support for `git worktree' worktrees.  There may still be
     bugs; the tests for this are not very comprehensive.  And
     worktrees on different filesystems may not work; that's a
     matter for the future.  Closes:#868515.
+  * Change the dpkg-source -i argument to exclude exactly the right
+    set of things.  (Sadly this is not a simple rune.)
+
+  Other improvements to dgit:
+  * New print-dpkg-source-ignores option to print the big rune
+    you need to pass to dpkg-source to make it work exactly right.
+  * Properly shell-quote the --git-builder argument to gbp.
 
   Documentation:
   * dgit-user(7): Provide information about how to use sbuild.
@@ -21,8 +44,14 @@ dgit (4.1~) experimental; urgency=medium
 
   Test suite:
   * sbuild-gitish: New test case to check running sbuild from git
-
- --
+  * Work around gnupg agent connection races by having our stunt
+    gpg wrapper simply try running gpg again, once, if it exits 2.
+    This does not fully suppress the bug but it does significantly reduce
+    the probability.
+  * Other tests for new features.
+  * Various refactoring.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 14 Aug 2017 09:31:03 +0100
 
 dgit (4.0) experimental; urgency=low