Merge tag dgit/2.14 into `defence in dgit-repos-server' branch

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 846fe2306bdf901a9b88d5fd4fb4d3eda3d62bd6..bfbffd5f26c6167be8b216e16f998730ee21ae68 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,42 @@
-dgit (2.13~) unstable; urgency=medium
+dgit (2.15~) unstable; urgency=low

 
 

+  * 
+
+ --
+
+dgit (2.14) unstable; urgency=critical
+
+  CRITICAL BUGFIX:
+  * Do not generate bogus commits with --overwrite or import-dsc.
+    Closes:#849041.
+
+  Test suite:
+  * Run a lot of git-fsck.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 04 Jan 2017 22:52:55 +0000
+
+dgit (2.13) unstable; urgency=high
+
+  Changed behaviour:

   * quilt fixup: Permit creation of patches which delete files, by psssing
     --include-removal to dpkg-source, and tolerating it when we do our
     quilt fixup analysis.  dpkg-source has supported this since at least
     stretch.  Closes:#848901.
   * quilt fixup: Permit creation of patches which delete files, by psssing
     --include-removal to dpkg-source, and tolerating it when we do our
     quilt fixup analysis.  dpkg-source has supported this since at least
     stretch.  Closes:#848901.

+
+  Error messages:

   * Improve "cannot represent change" message: print the git old and new
     modes too.
 
   * Improve "cannot represent change" message: print the git old and new
     modes too.
 

- --
+  Bugfix:
+  * Import: Switch back to unpa branch on patch import iterations.
+    In particular, do not fail utterly if dpkg-source and gbp disagree.
+    Closes:#848843.
+
+  Documentation [Sean Whitton]:
+  * dgit-maint-gbp(7): Remove reference to closed bug.  Closes:#848725.
+  * dgit-sponsorship(7): Update in light of fixed #844129.  Closes:#848789.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 21 Dec 2016 01:32:41 +0000

 
 dgit (2.12) unstable; urgency=high
 
 
 dgit (2.12) unstable; urgency=high