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

diff --git a/debian/changelog b/debian/changelog
index e2c37a21..0dd60cbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +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.
@@ -6,13 +35,23 @@ dgit (4.1~) experimental; urgency=medium
   * dgit-user(7): Fixed example rune to use curl (which prints
     to stdout, as the rune expects).  [reported by Simon Tatham]
 
+  Minor improvements:
+  * Do not leave many clog-* files in .git/dgit.
+
   Internal changes:
   * using-these: New script to help with ad-hoc-testing.
+  * Refactoring in preparation for push-source [Sean Whitton].
 
   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