X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fchangelog;h=591ee6779baae62402b72502acab8ad0d696183f;hb=8b74ec543cd65112bd83f57dad5c7dcffb592224;hp=7bae4d2ef74ef36da82bb8fd5c78127ab0381ed8;hpb=a6c565be751393ef52d2b74919b7ce2744019394;p=dgit.git

diff --git a/debian/changelog b/debian/changelog
index 7bae4d2e..591ee677 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,48 @@
-dgit (4.1~) experimental; urgency=medium
+dgit (4.2~) experimental; urgency=medium
+
+  Documentation improvements:
+  * dgit(1): Add a bit more rationale (polemic, even).  Closes:#874221.
+  * Recommend mk-build-deps rather than apt-get build-dep.
+    Suggestion from Nikolaus Rath.  Closes:#863361.
+  * dgit-maint-merge(7): many updates.  [Sean Whitton]
+    Closes:#864873,#878433.
+  * dgit-*(7): Mention first upload trick.  [Andrew Shadura,
+    Sean Whitton]  Closes:#856402.
+
+  Minor fixes:
+  * When source discrepancy involves file mode changes, report them
+    specially.  Closes:#886442.
+  * In split brain mode, with unexpected diffs, print dgit view
+    commitid in suggested diff rune.  (HEAD is wrong.)  Closes:#886443.
+  * Fix message about missing quilt cache entry to refer to
+    HEAD rather than tree, since dgit needs a commit.  Closes:#884646.
+  * Fix grammar error in 4.1 changelog entry. [Sean Whitton]
+  * Remove some whitespace "errors". [Sean Whitton]
+
+  Packaging:
+  * Remove dependency alternative on realpath (package last existed in
+    Debian wheezy).  Closes:#877552.
+
+  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.
@@ -25,8 +63,10 @@ dgit (4.1~) experimental; urgency=medium
     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