From: Russ Allbery <rra@debian.org>
Date: Mon, 4 Apr 2011 03:53:00 +0000 (-0700)
Subject: Merge branch 'master' into bug504880-rra
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c66db653861426aaf534a2db5647c72e564ac1fd;p=debian%2Fdebian-policy.git

Merge branch 'master' into bug504880-rra

Conflicts:
	policy.sgml
---

c66db653861426aaf534a2db5647c72e564ac1fd
diff --cc policy.sgml
index 774c822,aa7f11b..ec605c6
--- a/policy.sgml
+++ b/policy.sgml
@@@ -4895,6 -4767,20 +4895,13 @@@ Build-Depends: foo [linux-any], bar [an
  		installation would hamper the ability of the system to
  		continue with any upgrade that might be in progress.
  	      </p>
+ 
 -	      <p>
 -		<tt>Pre-Depends</tt> are also required if the
 -		<prgn>preinst</prgn> script depends on the named
 -		package.  It is best to avoid this situation if
 -		possible.
 -	      </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">.
++		doing that has been reached.  See <ref id="dependencies">.
++	      </p>
  	    </item>
  	  </taglist>
  	</p>