Julien Cristau <jcris...@debian.org> writes:
> I don't know whether to remove just this part, or everything relating to
> X11R6. Opinions?
> diff --git a/policy.sgml b/policy.sgml
> index 300d7f7..5cd463e 100644
> --- a/policy.sgml
> +++ b/policy.sgml
> @@ -8619,22 +8619,8 @@ name ["<var>syshostname</var>"]:
> <p>
> Packages should install any relevant files into the
> directories <file>/usr/include/X11/</file> and
> - <file>/usr/lib/X11/</file>, but if they do so, they must
> - pre-depend on <tt>x11-common (>=
> - 1:7.0.0)</tt><footnote>
> - <p>
> - These libraries used to be all symbolic
> - links. However, with <tt>X11R7</tt>,
> - <tt>/usr/include/X11</tt> and <tt>/usr/lib/X11</tt>
> - are now real directories, and packages
> - <strong>should</strong> ship their files here instead
> - of in <tt>/usr/X11R6/{include,lib}/X11</tt>.
> - <tt>x11-common (>= 1:7.0.0) </tt> is the package
> - responsible for converting these symlinks into
> - directories.
> - </p>
> - </footnote>
> - </p>
> + <file>/usr/lib/X11/</file>.
> + </p>
> </sect1>
>
> <sect1>
I was about to apply this, but then realized that it leaves the following,
which seems a bit odd and self-contradictory:
<p>
The installation of files into subdirectories
of <file>/usr/X11R6/include/X11/</file> and
<file>/usr/X11R6/lib/X11/</file> is now prohibited;
package maintainers should determine if subdirectories of
<file>/usr/lib/</file> and <file>/usr/share/</file> can be used
instead.
</p>
<p>
Packages should install any relevant files into the
directories <file>/usr/include/X11/</file> and
<file>/usr/lib/X11/</file>.
</p>
I think what we want to say is:
<p>
The installation of files into subdirectories of
<file>/usr/X11R6/include/X11/</file> and
<file>/usr/X11R6/lib/X11/</file> is now prohibited. Include
files should be installed into <file>/usr/include/X11/</file>.
For files that previously would be installed into
subdirectories of <file>/usr/X11R6/lib/X11/</file>, package
maintainers should determine if subdirectories of
<file>/usr/lib/</file> and <file>/usr/share/</file> can be
used. If not, a subdirectory of <file>/usr/lib/X11/</file>
should be used.
</p>
Does that sound right?
--
Russ Allbery (r...@debian.org) <http://www.eyrie.org/~eagle/>
--
To UNSUBSCRIBE, email to debian-policy-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
