Move Speedo fonts into the deprecated category

The Speedo directory isn't part of the default X font path for a long
time, and libxfont in lenny disabled support for speedo fonts.

Closes #522218

diff --git a/debian/changelog b/debian/changelog
index 1916096033e3fc14a71a14606b8c7bc898262432..a94496ae1780da122fe9005c9aa2210fee3b742f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,11 @@ debian-policy (3.8.2.0) UNRELEASED; urgency=low
     Seconded: Julien Cristau <jcristau@debian.org>
     Seconded: Andrew McMillan <andrew@morphoss.com>
     Closes: #522364
+  * Policy: Move Speedo fonts into the deprecated category
+    Wording: Julien Cristau <jcristau@debian.org>
+    Seconded: Russ Allbery <rra@debian.org>
+    Seconded: Julien Danjou <acid@debian.org>
+    Closes: #522218
   * Housekeeping (resynchronizing lists maintained elsewhere):
     - Add GFDL 1.3 to the common-licenses list.
     - Update the list of archive sections.  (Closes: #519835)

diff --git a/policy.sgml b/policy.sgml
index a5c9d139f7997a41799e44f4d25e695d613cb1ab..a2089bc7e715862e12a34f731f1cd6580c8257c1 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -8413,11 +8413,6 @@ name ["<var>syshostname</var>"]:
                  </list>
              </item>
 
-             <item>
-                 Speedo fonts must be placed in
-                 <file>/usr/share/fonts/X11/Speedo/</file>.
-             </item>
-
              <item>
                  Type 1 fonts must be placed in
                  <file>/usr/share/fonts/X11/Type1/</file>.  If font
@@ -8429,9 +8424,9 @@ name ["<var>syshostname</var>"]:
                  Subdirectories of <file>/usr/share/fonts/X11/</file>
                  other than those listed above must be neither
                  created nor used.  (The <file>PEX</file>, <file>CID</file>,
-                 and <file>cyrillic</file> directories are excepted for
-                 historical reasons, but installation of files into
-                 these directories remains discouraged.)
+                 <file>Speedo</file>, and <file>cyrillic</file> directories
+                 are excepted for historical reasons, but installation of
+                 files into these directories remains discouraged.)
              </item>
 
              <item>

diff --git a/upgrading-checklist.html b/upgrading-checklist.html
index 58f07409dde489647c0ac2476c4fa66183f01302..99a972bab298820397d277dc0e446e97218bd6cb 100644 (file)
--- a/upgrading-checklist.html
+++ b/upgrading-checklist.html
@@ -54,6 +54,8 @@ picking your way through this list.
        FHS permitting /etc/X11/XF86Config-4.                     [9.1]
      * Removed obsolete dependency requirements for packages that use
        /var/mail.                                                [9.1.3]
+     * Speedo fonts are now deprecated.  The X backend was disabled
+       starting in lenny.                                        [11.8.5]
      * The GNU Free Documentation License version 1.3 is included in
        common-licenses and should be referenced from there.      [12.5]