X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=policy.sgml;h=ec605c60662682d4ae3e690d40e8a8841b7d0ce9;hb=c66db653861426aaf534a2db5647c72e564ac1fd;hp=774c8225313222a6420ae457c5a07f2667053583;hpb=6cfe091b91f402a3c42b6c55b94a1cc701c1ec04;p=debian%2Fdebian-policy.git

diff --git a/policy.sgml b/policy.sgml
index 774c822..ec605c6 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -1090,7 +1090,7 @@
 
       </sect>
 
-      <sect>
+      <sect id="dependencies">
 	<heading>Dependencies</heading>
 
 	<p>
@@ -2565,7 +2565,7 @@ Package: libc6
 	    <item><qref id="f-Source"><tt>Source</tt></qref> (mandatory)</item>
 	    <item><qref id="f-Maintainer"><tt>Maintainer</tt></qref> (mandatory)</item>
 	    <item><qref id="f-Uploaders"><tt>Uploaders</tt></qref></item>
-	    <item><qref id="f-DM-Upload-Allowed"<tt>DM-Upload-Allowed</tt></qref></item>
+	    <item><qref id="f-DM-Upload-Allowed"><tt>DM-Upload-Allowed</tt></qref></item>
 	    <item><qref id="f-Section"><tt>Section</tt></qref> (recommended)</item>
 	    <item><qref id="f-Priority"><tt>Priority</tt></qref> (recommended)</item>
 	    <item><qref id="sourcebinarydeps"><tt>Build-Depends</tt> et al</qref></item>
@@ -2671,7 +2671,7 @@ Package: libc6
 	  <item><qref id="f-Version"><tt>Version</tt></qref> (mandatory)</item>
 	  <item><qref id="f-Maintainer"><tt>Maintainer</tt></qref> (mandatory)</item>
 	  <item><qref id="f-Uploaders"><tt>Uploaders</tt></qref></item>
-	  <item><qref id="f-DM-Upload-Allowed"<tt>DM-Upload-Allowed</tt></qref></item>
+	  <item><qref id="f-DM-Upload-Allowed"><tt>DM-Upload-Allowed</tt></qref></item>
 	  <item><qref id="f-Homepage"><tt>Homepage</tt></qref></item>
 	  <item><qref id="f-Standards-Version"><tt>Standards-Version</tt></qref> (recommended)</item>
 	  <item><qref id="sourcebinarydeps"><tt>Build-Depends</tt> et al</qref></item>
@@ -4895,6 +4895,13 @@ Build-Depends: foo [linux-any], bar [any-i386], baz [!linux-any]
 		installation would hamper the ability of the system to
 		continue with any upgrade that might be in progress.
 	      </p>
+
+	      <p>
+		You should not specify a <tt>Pre-Depends</tt> entry for a
+		package before this has been discussed on the
+		<tt>debian-devel</tt> mailing list and a consensus about
+		doing that has been reached.  See <ref id="dependencies">.
+	      </p>
 	    </item>
 	  </taglist>
 	</p>
@@ -6148,13 +6155,13 @@ install -m644 debian/shlibs.<var>package</var> debian/<var>package</var>/DEBIAN/
                   <file>/lib/<var>triplet</var></file> and
                   <file>/usr/lib/<var>triplet</var></file>, where
                   <tt><var>triplet</var></tt> is the value returned by
-                  <tt>dpkg-architecture -qDEB_HOST_GNU_TYPE</tt> for the
+                  <tt>dpkg-architecture -qDEB_HOST_MULTIARCH</tt> for the
                   architecture of the package.  Packages may <em>not</em>
                   install files to any <var>triplet</var> path other
                   than the one matching the architecture of that package;
                   for instance, an <tt>Architecture: amd64</tt> package
                   containing 32-bit x86 libraries may not install these
-                  libraries to <file>/usr/lib/i486-linux-gnu</file>.
+                  libraries to <file>/usr/lib/i386-linux-gnu</file>.
                   <footnote>
                     This is necessary in order to reserve the directories for
                     use in cross-installation of library packages from other
@@ -9061,9 +9068,9 @@ name ["<var>syshostname</var>"]:
 
               <item>
                   If the window manager complies with <url
-		    id="http://www.freedesktop.org/Standards/wm-spec"
+		    id="http://www.freedesktop.org/wiki/Specifications/wm-spec"
 		    name="The Window Manager Specification Project">,
-                  written by the <url id="http://www.freedesktop.org/"
+                  written by the <url id="http://www.freedesktop.org/wiki/"
 		    name="Free Desktop Group">, add 40 points.
               </item>