Merge branch 'master' into bug23712-rra

diff --combined policy.sgml
index 4c213e6a1a384700ebd0029f5dff17f6a7350955,13f95b0d191ce0a3019c72b808b69337107c0365..7a3398745a8dd133dbf1afecfeb3faf2c750a205
--- 1/policy.sgml
--- 2/policy.sgml
+++ b/policy.sgml
@@@ -2535,6 -2535,7 +2535,7 @@@ Package: libc
            <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-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>
@@@ -2640,6 -2641,7 +2641,7 @@@
          <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-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>
@@@ -3631,6 -3633,21 +3633,21 @@@ Checksums-Sha256
            must match the list of files in the <tt>Files</tt> field.
          </p>
        </sect1>
+ 
+       <sect1 id="f-DM-Upload-Allowed">
+         <heading><tt>DM-Upload-Allowed</tt></heading>
+ 
+         <p>
+           The most recent version of a package uploaded to unstable or
+           experimental must include the field <tt>DM-Upload-Allowed:
+           yes</tt> in the source section of its source control file for
+           the Debian archive to accept uploads signed with a key in the
+           Debian Maintainer keyring.  See the General
+           Resolution <url id="http://www.debian.org/vote/2007/vote_003"
+           name="Endorse the concept of Debian Maintainers"> for more
+           details.
+         </p>
+       </sect1>
        </sect>
  
        <sect>
@@@ -7957,6 -7974,22 +7974,6 @@@ ln -fs ../sbin/sendmail debian/tmp/usr/
        <sect1>
          <heading>Sharing configuration files</heading>
  
 -        <p>
 -          Packages which specify the same file as a
 -          <tt>conffile</tt> must be tagged as <em>conflicting</em>
 -          with each other.  (This is an instance of the general rule
 -          about not sharing files.  Note that neither alternatives
 -          nor diversions are likely to be appropriate in this case;
 -          in particular, <prgn>dpkg</prgn> does not handle diverted
 -          <tt>conffile</tt>s well.)
 -        </p>
 -
 -        <p>
 -          The maintainer scripts must not alter a <tt>conffile</tt>
 -          of <em>any</em> package, including the one the scripts
 -          belong to.
 -        </p>
 -
          <p>
            If two or more packages use the same configuration file
            and it is reasonable for both to be installed at the same
@@@ -8006,34 -8039,6 +8023,34 @@@
            and which manages the shared configuration files.  (The
            <tt>sgml-base</tt> package is a good example.)
          </p>
 +
 +        <p>
 +          If the configuration file cannot be shared as described above,
 +          the packages must be marked as conflicting with each other.
 +          Two packages that specify the same file as
 +          a <tt>conffile</tt> must conflict.  This is an instance of the
 +          general rule about not sharing files.  Neither alternatives
 +          nor diversions are likely to be appropriate in this case; in
 +          particular, <prgn>dpkg</prgn> does not handle diverted
 +          <tt>conffile</tt>s well.
 +        </p>
 +
 +        <p>
 +          When two packages both declare the same <tt>conffile</tt>, they
 +          may see left-over configuration files from each other even
 +          though they conflict with each other.  If a user removes
 +          (without purging) one of the packages and installs the other,
 +          the new package will take over the <tt>conffile</tt> from the
 +          old package.  If the file was modified by the user, it will be
 +          treated the same as any other locally
 +          modified <tt>conffile</tt> during an upgrade.
 +        </p>
 +
 +        <p>
 +          The maintainer scripts must not alter a <tt>conffile</tt>
 +          of <em>any</em> package, including the one the scripts
 +          belong to.
 +        </p>
        </sect1>
  
        <sect1>