X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Fchangelog;h=ad1fb8e4ba1bfb5f95e7528ed9b0e5d2fda749c2;hp=f5a4025c9586cc5cd250aa452701e083ac45d374;hb=3a05780783d8c93088ec43d850f2fd46fae49d2c;hpb=11f0fbcd7d0697ac075931a4f86d83f2fc944cf7

diff --git a/debian/changelog b/debian/changelog
index f5a4025c..ad1fb8e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,35 @@
-dgit (5.0~) unstable; urgency=low
+dgit (5.1) unstable; urgency=medium
+
+  dgit gitattributes handling:
+  * Squash the working-tree-encoding attribute too.
+  * Update an existing `dgit-defuse-attrs' macro in .git/info/attributes.
+  * Test the working-tree-encoding attribute squashing properly.
+    Closes:#901900.
+
+  git-debrebase fixes:
+  * new-upstream: fix (this time for sure) ff check handling
+    of multi-piece upstreams.
+  * Suppress gbp pq export output, except in case of error.
+    Closes:#901809.
+  * Manpages: Fix typos and etc.
+  * Fix a typo in the package description.
 
-  Major new utility:
-  * git-debrebase, a new git workflow tool.
+  Test suite:
+  * Triger ci.debian.net autopkgtests on: gnupg diffutils patch.
+    (A dummy test is used to add to Testsuite-Triggers.)
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 20 Jun 2018 23:20:57 +0100
+
+dgit (5.0) unstable; urgency=low
+
+  Major new facility:
+  * git-debrebase, a new git workflow tool, in its own package.
   * dgit will now, when appropriate, check if it should call
     git-debrebase.
 
+  [ Thanks to Sean Whitton for much useful input, and for
+     dgit-maint-debrebase(7). ]
+
   dgit bugfixes:
   * Fix the exit status of programs in dgit.deb, to avoid the Perl
     misfeature which sometimes copies $! to the exit status.
@@ -21,7 +46,7 @@ dgit (5.0~) unstable; urgency=low
   * Break git_get_symref and $extra_orig_namepart_re out into Dgit.pm.
   * Changes to support git-debrebase.
 
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 18 Jun 2018 00:29:44 +0100
 
 dgit (4.4) unstable; urgency=high