changelog: Mention dgit-maint-merge changes

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 2136b8b641de52b631c06cd7b43fb87bd7a39d54..5211a3c07c0ac3f096f513915ad344e12e0a60ff 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,30 @@
-dgit (2.11~) unstable; urgency=medium
+dgit (2.12~) unstable; urgency=medium
+
+  * Fix dgit-repos-policy-debian which broke due to recent git setting
+    GIT_ALTERNATE_OBJECT_DIRECTORIES in the pre-receive-hook.
+  * dgit-maint-merge(7): Explain how to change to this workflow
+    from an existing git workflow.  [Sean Whitton]  Closes:#847807.
+
+  Test suite:
+  * Provide and use stunt lintian and debuild, to avoid lintian
+    complaining about our stupid test packages.
+
+ --
+
+dgit (2.11) unstable; urgency=medium
 
   Documentation:
   * dgit-user(7): Better explanation of combined suites (comma syntax).
     Thanks to Sean Whitton for review and suggestions.
   * dgit(1), dgit(7): Better reference docs for combined suites.
+  * dgit(1): Improve formatting of rpush section.
 
   Test suite:
   * Replace make in Test-Depends with build-essential.  Most of the tests
     do in fact run dpkg-buildpackage which bombs out if build-essential is
     missing.
 
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Tue, 08 Nov 2016 22:41:29 +0000
 
 dgit (2.10) unstable; urgency=medium