summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2022-12-29 11:58:38 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2022-12-29 11:58:38 +0000
commit5bb461ee0849fdf448bada6af3ef78adaec060cf (patch)
treefea4f445c50e42ed17c952918763fa0a2ac38725
parent066d8dfc76c6fd5ae51b3aef927bef604e041b10 (diff)
changelog: Finalise 10.4debian/10.4archive/debian/10.4
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--debian/changelog10
1 files changed, 7 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 696d2fb..e66edfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-dgit (10.4~) unstable; urgency=medium
+dgit (10.4) unstable; urgency=medium
- *
+ * Tainted object handling: Require policy-client-query to be supported
+ when talking to the Debian server, so this check is now properly
+ implemented rather than best-effort. Closes: #944855, #1027186.
+ [Completes work prompted by report from Felipe Sateler.]
+ * git-debrebase(1): Be less scary about --experimental-merge-resolution.
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk> Thu, 29 Dec 2022 11:51:50 +0000
dgit (10.3) unstable; urgency=medium