changelog: Mention dgit-maint-merge changes

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 907509005e5f8be9c6432273f206e34ec63299e0..5211a3c07c0ac3f096f513915ad344e12e0a60ff 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+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: