X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=debian%2Fchangelog;h=b34b4a0e090ed0041456966ab9faac9e8631b4c0;hb=c0df25cd65b0172d5130e01a73aa610c3b0dd105;hp=a70ec3849edd9985f6ea6b5a3ef4a06b0f868def;hpb=da6f19f4f54e84723e9d1435bcfd4f7db8e55986;p=dgit.git

diff --git a/debian/changelog b/debian/changelog
index a70ec384..b34b4a0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,48 @@
-dgit (5.1~) unstable; urgency=medium
-
-  * git-debrebase manpages: Fix typos and etc.
+dgit (5.2~) unstable; urgency=medium
+
+  * dgit(1): Mention under `dgit build' that it uses the network.
+
+  dgit:
+  * When all Debian changes vanish with single-debian-patch,
+    do not fail to commit the patch queue removal.  Closes:#877036.
+  * When build fails because the network is offline, mention
+    that this is because --since-version was not specified.
+    Closes:#883340.
+  * When quilt fixup fails because of discrepancies, print a
+    git diff rune which will show them.  Closes:#865446.
+  * When fetch or push wants git fetch (other than in a situation where it
+    happes to be a noop) but --dry-run was specified, fail with an
+    explanation, rather than looping with a false coplaint about git
+    fetch.  Closes:#871317.
+
+  test suite:
+  * Use nproc(1) rather than Sys::CPU.  This is more portable and does not
+    depend on libsys-cpu-perl being installed.  Closes:888496.
 
  --
 
+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.
+
+  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: