Merge branch 'master' into bug504880-rra

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

diff --git a/debian/changelog b/debian/changelog
index 9ef02df43d17e5f31ce572d6c1144d5f83921cd3..400c0633164549108677ab6940f4f7cdb194c067 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,17 +31,29 @@ debian-policy (3.9.1.0) UNRELEASED; urgency=low
     Seconded: Guillem Jover <guillem@debian.org>
     Seconded: Raphaël Hertzog <hertzog@debian.org>
     Closes: #400322
+  * Policy: Say Conflicts should not be used unless necessary
+    Wording: Russ Allbery <rra@debian.org>
+    Seconded: Guillem Jover <guillem@debian.org>
+    Seconded: Jakub Wilk <jwilk@debian.org>
+    Closes: #402721
+  * Policy: Remove obsolete _REENTRANT, require thread-safe libraries
+    Wording: Russ Allbery <rra@debian.org>
+    Seconded: Kurt Roeckx <kurt@roeckx.be>
+    Seconded: Giacomo A. Catenazzi <cate@debian.org>
+    Closes: #475101
+  * Policy: Allow subdirectories of /usr/lib/cgi-bin to be used
+    Wording: Russ Allbery <rra@debian.org>
+    Seconded: Andrew McMillan <andrew@morphoss.com>
+    Seconded: Charles Plessy <plessy@debian.org>
+    Closes: #104373
   * Set the version of the Perl Policy to match the version of the Policy
     package.
   * Explain the Perl module package naming policy more explicitly and
     provide some examples.  (Closes: #175202)
-  * Add Pre-Depends and Build-Depends-Indep to the relationships not
-    allowed from main to contrib or non-free and mention that such
-    relationships are okay if the non-free package is only an
-    alternative.  Thanks, Raphael Geissert.  (Closes: #587279)
   * Revise the footnote discussing shlibs creation to not talk about the
     switch to objdump as if it were a new innovation and to explicitly
     mention the NEEDED attribute as the source of dependency information.
+  * Fix typo in upgrading-checklist.  (Closes: #588750)
 
  -- Russ Allbery <rra@debian.org>  Mon, 28 Jun 2010 09:34:54 -0700