From 912b70829ceb87de21b9eeca1eee6d24adee72f7 Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@debian.org>
Date: Sat, 12 Jun 2010 10:49:45 -0700
Subject: [PATCH] Changelog and upgrading-checklist information for Bug#284340

---
 debian/changelog         | 6 ++++++
 upgrading-checklist.sgml | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2e4500b..5cbd885 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,12 @@ debian-policy (3.8.5.0) UNRELEASED; urgency=low
     Seconded: Andrew McMillan <andrew@morphoss.com>
     Seconded: Giacomo A. Catenazzi <cate@debian.org>
     Closes: #569174
+  * Policy: Deprecate /usr/share/common-licenses/BSD
+    Wording: Russ Allbery <rra@debian.org>
+    Seconded: Emilio Pozuelo Monfort <pochu@debian.org>
+    Seconded: Jakub Wilk <jwilk@debian.org>
+    Seconded: gregor herrmann <gregoa@debian.org>
+    Closes: #284340
   * Perl Policy: Change perlapi provides to use an ABI version
     Wording: Niko Tyni <ntyni@debian.org>
     Seconded: Russ Allbery <rra@debian.org>
diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml
index 03669f9..4403115 100644
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -64,6 +64,13 @@ Release Jun 2010.
   <item><file>init.d</file> scripts are a possible exception from the
   normal requirement to use <tt>set -e</tt> in each shell script.
   </item>
+<tag>12.5</tag>
+  <item>The UCB BSD license was removed from the list of licenses that
+  should be referenced from <file>/usr/share/common-licenses/BSD</file>.
+  It should instead be included directly
+  in <file>debian/copyright</file>, although it will still be in
+  common-licenses for the time being.
+  </item>
 <tag>perl</tag>
   <item><package>perl-base</package> now
   provides <package>perlapi-<var>abiname</var></package> instead of a
-- 
2.39.5