changelog: Mention dgit-maint-merge changes

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 691b783dbf825a1f31741ad4ee577b6a080c7348..5211a3c07c0ac3f096f513915ad344e12e0a60ff 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,19 +1,56 @@
-dgit (2.10~) 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
+
+  New features:
   * Support the Debian *-security suites.
-  * Test suite: Add fakeroot and make to Test-Depends.  These aren't
-    necessarily pulled in by anything else.  (dpkg-dev Recommends
-    build-essential.  But we don't actually need build-essential.)
-  * When cloning a distro which has no git server, correctly leave
-    the user on the local dgit branch, not on `master'.
-  * Actually honour the branch name, if we are on dgit branch, to specify
-    the suite, as documented in the manpage.
   * New comma-separated multiple-suite merging facility (readonly),
     so that users can easily track "jessie, or jessie-security".
+  * dgit-user(7): Suggest `dgit clone P jessie,-security'.
+
+  Bugfixes:
+  * Cope when an orig tarball is a tarbomb.  Ie, if it contains
+    other than one single directory toplevel.  Closes:#843422.
+  * Actually honour the branch name, if we are on dgit branch, to specify
+    the suite, as documented in the manpage.
+  * When cloning a distro which has no git server, correctly leave
+    the user on the local dgit branch, not on `master'.
   * Fix an unconditional print that was supposed to be a printdebug:
       origs <blah>.orig.tar.gz f.same=1 #f._differ=-1
+  * Print a slightly better message if .git found in orig tarball(s).
 
- --
+  Test suite:
+  * Test suite: Add fakeroot and make to Test-Depends.  These aren't
+    necessarily pulled in by anything else.  (dpkg-dev Recommends
+    build-essential.  But we don't actually need build-essential.)
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Tue, 08 Nov 2016 01:08:51 +0000
 
 dgit (2.9) unstable; urgency=medium