Add changelog and upgrading-checklist for #626779

[debian/debian-policy.git] / policy.sgml

diff --git a/policy.sgml b/policy.sgml
index 91173a5d8dc75381d63d02ea5070944ea9e4b513..0650306fec093eb14b94337818ad4d936b679eb0 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -2975,10 +2975,14 @@ Package: libc6
 
          <p>
            In the source package control file <file>.dsc</file>, this
-           field may contain either the architecture
-           wildcard <tt>any</tt> or a list of architectures and
-           architecture wildcards separated by spaces. If a list is
-           given, it may include (or consist solely of) the special
+           field contains a list of architectures and architecture
+           wildcards separated by spaces. When the list contains the
+           architecture wildcard <tt>any</tt>, the only other value
+           allowed in the list is <tt>all</tt>.
+         </p>
+
+         <p>
+           The list may include (or consist solely of) the special
            value <tt>all</tt>.  In other words, in <file>.dsc</file>
            files unlike the <file>debian/control</file>, <tt>all</tt> may
            occur in combination with specific architectures.
@@ -2989,19 +2993,23 @@ Package: libc6
          </p>
 
          <p>
-           Specifying <tt>any</tt> indicates that the source package
+           Specifying only <tt>any</tt> indicates that the source package
            isn't dependent on any particular architecture and should
            compile fine on any one. The produced binary package(s)
-           will either be specific to whatever the current build
-           architecture is or will be architecture-independent.
+           will be specific to whatever the current build architecture is.
          </p>
 
          <p>
            Specifying only <tt>all</tt> indicates that the source package
-           will only build architecture-independent packages.  If this is
-           the case, <tt>all</tt> must be used rather than <tt>any</tt>;
-           <tt>any</tt> implies that the source package will build at
-           least one architecture-dependent package.
+           will only build architecture-independent packages.
+         </p>
+
+         <p>
+           Specifying <tt>any all</tt> indicates that the source package
+           isn't dependent on any particular architecture. The set of
+           produced binary packages will include at least one
+           architecture-dependant package and one architecture-independent
+           package.
          </p>
 
          <p>
@@ -9370,41 +9378,6 @@ name ["<var>syshostname</var>"]:
            policy (such as for <ref id="appdefaults">).
          </p>
        </sect1>
-
-       <sect1>
-         <heading>The OSF/Motif and OpenMotif libraries</heading>
-
-         <p>
-           <em>Programs that require the non-DFSG-compliant OSF/Motif or
-             OpenMotif libraries</em><footnote>
-               OSF/Motif and OpenMotif are collectively referred to as
-               "Motif" in this policy document.
-           </footnote>
-           should be compiled against and tested with LessTif (a free
-           re-implementation of Motif) instead.  If the maintainer
-           judges that the program or programs do not work
-           sufficiently well with LessTif to be distributed and
-           supported, but do so when compiled against Motif, then two
-           versions of the package should be created; one linked
-           statically against Motif and with <tt>-smotif</tt>
-           appended to the package name, and one linked dynamically
-           against Motif and with <tt>-dmotif</tt> appended to the
-           package name.
-         </p>
-
-         <p>
-           Both Motif-linked versions are dependent
-           upon non-DFSG-compliant software and thus cannot be
-           uploaded to the <em>main</em> distribution; if the
-           software is itself DFSG-compliant it may be uploaded to
-           the <em>contrib</em> distribution.  While known existing
-           versions of Motif permit unlimited redistribution of
-           binaries linked against the library (whether statically or
-           dynamically), it is the package maintainer's
-           responsibility to determine whether this is permitted by
-           the license of the copy of Motif in their possession.
-         </p>
-       </sect1>
       </sect>
 
       <sect id="perl">
@@ -11307,4 +11280,4 @@ END-INFO-DIR-ENTRY
 <!-- Local variables: -->
 <!-- indent-tabs-mode: t -->
 <!-- End: -->
-<!-- vim:set ai et sts=2 sw=2 tw=76: -->
+<!-- vim:set ai sts=2 sw=2 tw=76: -->