X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=policy.sgml;h=b27c9da5d95f5bd10a033705f1558344e347d994;hb=907905af29883401668ca56652c6b9e0a75f75fe;hp=d02f6c17495e062ed8cee24273a3ca0a9d33c8f2;hpb=45254c9542676d941d155070d2980306407d9294;p=debian%2Fdebian-policy.git
diff --git a/policy.sgml b/policy.sgml
index d02f6c1..b27c9da 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -8577,54 +8577,34 @@ name ["syshostname"]:
Installation directory issues
- Packages using the X Window System should not be
- configured to install files under the
- /usr/X11R6/ directory. The
- /usr/X11R6/ directory hierarchy should be
+ Historically, packages using the X Window System used a
+ separate set of installation directories from other packages.
+ This practice has been discontinued and packages using the X
+ Window System should now generally be installed in the same
+ directories as any other package. Specifically, packages must
+ not install files under the /usr/X11R6/ directory
+ and the /usr/X11R6/ directory hierarchy should be
regarded as obsolete.
- Programs that use GNU autoconf and
- automake are usually easily configured at
- compile time to use /usr/ instead of
- /usr/X11R6/, and this should be done whenever
- possible. Configuration files for window managers and
- display managers should be placed in a subdirectory of
- /etc/X11/ corresponding to the package name due
- to these programs' tight integration with the mechanisms
- of the X Window System. Application-level programs should
- use the /etc/ directory unless otherwise mandated
- by policy.
+ Include files previously installed under
+ /usr/X11R6/include/X11/ should be installed into
+ /usr/include/X11/. For files previously
+ installed into subdirectories of
+ /usr/X11R6/lib/X11/, package maintainers should
+ determine if subdirectories of /usr/lib/ and
+ /usr/share/ can be used. If not, a subdirectory
+ of /usr/lib/X11/ should be used.
- The installation of files into subdirectories
- of /usr/X11R6/include/X11/ and
- /usr/X11R6/lib/X11/ is now prohibited;
- package maintainers should determine if subdirectories of
- /usr/lib/ and /usr/share/ can be used
- instead.
-
-
-
- Packages should install any relevant files into the
- directories /usr/include/X11/ and
- /usr/lib/X11/, but if they do so, they must
- pre-depend on x11-common (>=
- 1:7.0.0)
-
- These libraries used to be all symbolic
- links. However, with X11R7,
- /usr/include/X11 and /usr/lib/X11
- are now real directories, and packages
- should ship their files here instead
- of in /usr/X11R6/{include,lib}/X11.
- x11-common (>= 1:7.0.0) is the package
- responsible for converting these symlinks into
- directories.
-
-
+ Configuration files for window managers and display managers
+ should be placed in a subdirectory of /etc/X11/
+ corresponding to the package name due to these programs' tight
+ integration with the mechanisms of the X Window System.
+ Application-level programs should use the /etc/
+ directory unless otherwise mandated by policy.