Fix typo in version numbers in dpkg-divert example

[debian/debian-policy.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 6375f50046cb35f5a97d300c71d29c8703edde43..1422ad7b193822fa58dd44ddeca1607114063bed 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,30 @@ debian-policy (3.9.3.0) UNRELEASED; urgency=low
     Seconded: Charles Plessy <plessy@debian.org>
     Seconded: Guillem Jover <guillem@debian.org>
     Closes: #626779
+  * Policy: Initial Debian maintainers need not be listed in copyright
+    Wording: Charles Plessy <plessy@debian.org>
+    Seconded: Russ Allbery <rra@debian.org>
+    Seconded: Raphaël Hertzog <hertzog@debian.org>
+    Seconded: Andrew McMillan <andrew@morphoss.com>
+    Closes: #593533
+  * Policy: Document cron job file naming restrictions
+    Wording: Karl E. Jorgensen <karl@jorgensen.org.uk>
+    Wording: Russ Allbery <rra@debian.org>
+    Seconded: Russ Allbery <rra@debian.org>
+    Seconded: Dominic Hargreaves <dom@earth.li>
+    Seconded: Javier Fernández-Sanguino Peña <jfs@computer.org>
+    Closes: #609162
+  * Policy: Document issues with conflicting packages sharing a conffile
+    Wording: Russ Allbery <rra@debian.org>
+    Seconded: Cyril Brulebois <kibi@debian.org>
+    Seconded: Raphaël Hertzog <hertzog@debian.org>
+    Closes: #23712
+  * MIME Policy: Retire this document and merge it with Policy
+    Wording: Ben Finney <ben+debian@benfinney.id.au>
+    Seconded: Russ Allbery <rra@debian.org>
+    Seconded: Raphaël Hertzog <hertzog@debian.org>
+    Seconded: Andrew McMillan <andrew@morphoss.com>
+    Closes: #89038
   * Consistently use "Debian source control file" for *.dsc files and
     "Source package control file" for debian/control files.  Patch from
     Charles Plessy.  (Closes: #626796)
@@ -27,10 +51,18 @@ debian-policy (3.9.3.0) UNRELEASED; urgency=low
   * Resynchronize the archive section list with ftp-master, adding
     education, introspection, and metapackages.  Patch from Charles
     Plessy.  (Closes: #651020)
+  * Clarify that packages in main may not declare Pre-Depends or
+    Build-Depends-Indep relationships outside of main either.  Partly
+    addresses #587279.
+  * Fix typo in the version numbers in the dpkg-divert examples.  Thanks,
+    Slavko.
   * Add the release date of 3.9.2.0 to upgrading-checklist.
   * Fix ordering of the last entries in the 3.9.2.0 upgrading-checklist.
   * Fix typo in upgrading-checklist entry for multiarch paths.  Thanks,
-    Michael Dorrington. Closes: #626408
+    Michael Dorrington.  (Closes: #626408)
+  * Add id tags for each version entry in upgrading-checklist so that,
+    when eventually published somewhere, other Debian web sites can link
+    to specific entries.  Patch from Charles Plessy.
   * Add AGPL-3 to tools/license-count.
   * Add build-arch and build-indep targets to debian/rules.