From: Manoj Srivastava <srivasta@debian.org>
Date: Thu, 16 Jun 2005 05:10:25 +0000 (+0000)
Subject: * Add XFree86 app-defaults ammendment             closes: Bug#83069
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bb5aded03385ddde526aa81e7f7ac0b2cf13f9bb;p=debian%2Fdebian-policy.git

* Add XFree86 app-defaults ammendment             closes: Bug#83069

Author: jdg
Date: 2001/02/18 14:23:26
  * Add XFree86 app-defaults ammendment             closes: Bug#83069

git-archimport-id: srivasta@debian.org--etch/debian-policy--devel--3.0--patch-84
---

diff --git a/debian/changelog b/debian/changelog
index 76184e3..f1bbff8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debian-policy (3.5.2.0) unstable; urgency=low
+
+  * Add XFree86 app-defaults ammendment             closes: Bug#83069
+
+ -- Julian Gilbey <jdg@debian.org>  Sun, 18 Feb 2001 14:11:49 +0000
+
 debian-policy (3.5.1.0) unstable; urgency=low
 
   * Removed deprecated virtual package names        closes: Bug#84641
diff --git a/policy.sgml b/policy.sgml
index c585df8..0150cd1 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -6151,32 +6151,26 @@
 
 	<p>
 	  <em>Application defaults</em> files must be installed in the
-	  directory <tt>/usr/X11R6/lib/X11/app-defaults/</tt>.
-	  <footnote>
-	    <p>Note: This shall change very shortly.</p>
-	  </footnote>
-	  They should not be registered as <em>conffile</em>s or
-	  otherwise treated as configuration files.  Customization of
-	  programs' X resources may be supported with the provision of
-	  a file with the same name as that of the package placed in
-	  the <tt>/etc/X11/Xresources/</tt> directory, which must
-	  registered as a <em>conffile</em>.  <em>Important:</em>
-	  packages that install files into the
-	  <tt>/etc/X11/Xresources/</tt> directory <em>must</em>
-	  declare a conflict with <tt>xbase (&lt;&lt;
-	    3.3.2.3a-2)</tt>; if this is not done it is possible for the
-	  installing package to destroy a previously-existing
-	  <tt>/etc/X11/Xresources</tt> <em>file</em> which had been
-	  customized by the system administrator.
-	  <footnote>
-	    <p>Rationale: clarifies the language to properly
-	      address the package maintainer, not the system
-	      administrator, as to how to manage
-	      /etc/X11/Xresources.</p>
-	  </footnote>
+	  directory <tt>/etc/X11/app-defaults/</tt> (use of a
+	  localized subdirectory of <tt>/etc/X11/</tt> as described in
+	  the <emph>X Toolkit Intrinsics - C Language Interface</emph>
+	  manual is also permitted).  They must be registered as
+	  <em>conffile</em>s or handled as configuration files.  For
+	  programs that are not linked against the X Toolkit (Xt)
+	  library, customization of programs' X resources may also be
+	  supported with the provision of a file with the same name as
+	  that of the package placed in the
+	  <tt>/etc/X11/Xresources/</tt> directory, which must
+	  registered as a <em>conffile</em> or handled as a
+	  configuration file.  <em>Important:</em> packages that
+	  install files into the <tt>/etc/X11/Xresources/</tt>
+	  directory <em>must</em> declare a conflict with <tt>xbase
+	  (&lt;&lt; 3.3.2.3a-2)</tt>; if this is not done it is
+	  possible for the installing package to destroy a
+	  previously-existing <tt>/etc/X11/Xresources</tt> file which
+	  had been customized by the system administrator.
 	</p>
 
-
 	<p>
 	  <em>Packages using the X Window System should abide by the FHS
 	    standard whenever possible</em>; they should install binaries,
diff --git a/upgrading-checklist.html b/upgrading-checklist.html
index 93073ed..5d64aa8 100644
--- a/upgrading-checklist.html
+++ b/upgrading-checklist.html
@@ -44,6 +44,11 @@ Manual.
 <h2>The checklist</h2>
 
 <pre>
+3.5.2.0                    Feb 01
+  Policy Manual:
+     - X app-defaults directory has moved from
+      /usr/X11R6/lib/X11/app-defaults to /etc/X11/app-defaults.
+
 3.5.1.0                    Feb 01
   Policy Manual:
      - dpkg-shlibdeps now uses objdump, so shared libraries have to be