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

diff --git a/debian/changelog b/debian/changelog
index 478ad5fe..e2c37a21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,27 @@
-dgit (3.12~) unstable; urgency=medium
+dgit (4.1~) experimental; urgency=medium
+
+  Documentation:
+  * dgit-user(7): Provide information about how to use sbuild.
+    Quite ugly due to #868527.  Closes:#868526.
+  * dgit-user(7): Fixed example rune to use curl (which prints
+    to stdout, as the rune expects).  [reported by Simon Tatham]
+
+  Internal changes:
+  * using-these: New script to help with ad-hoc-testing.
+
+  Test suite:
+  * sbuild-gitish: New test case to check running sbuild from git
+
+ --
+
+dgit (4.0) experimental; urgency=low
+
+  * dgit: --deliberately-not-fast-forward works properly in
+    split view quilt modes (suppressing the pseudomerge).
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 12 Feb 2017 22:22:31 +0000
+
+dgit (3.12) unstable; urgency=high
 
   Important bugfixes to dgit:
   * Pass --no-renames to git diff-tree -z, avoiding potential trouble.
@@ -9,6 +32,7 @@ dgit (3.12~) unstable; urgency=medium
   * dgit import: Right error message for missing files in ..
   * dgit import: Avoid making broken symlinks in ..
   * quilt fixup: Tolerate deletion of executable files.
+  * quilt fixup: Tolerate symlink creation (make patches).  Closes:#857382.
 
   Important bugfixes to other components:
   * dgit-repos-server: Do not reject commits with no author/committer
@@ -21,8 +45,10 @@ dgit (3.12~) unstable; urgency=medium
   * t-report-fail: print $PWD as part of failure message.
   * import-dsc: Test missing files, particularly in ..
   * run git gc on tests/worktrees/example_1.0.tar.
+  * quilt fixup: Check we can delete files with funny modes
+  * quilt fixup: Check that funny changes are represented properly
 
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 16 Jul 2017 21:36:24 +0100
 
 dgit (3.11~deb9u1) stretch; urgency=high