From 4b9842946493606a983eb8588b4c85c4e206710a Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Mon, 2 Jun 2008 12:51:32 -0700 Subject: [PATCH] Policy: remove obsolete app-defaults and Xresources provisions No longer require packages providing files in /etc/X11/Xresources to conflict with an ancient version of xbase which is no longer even in oldstable. Drop the explicit prohibition on /usr/X11R6/lib/X11/app-defaults, which is no longer used by Debian at all and already covered by the rest of the paragraph. --- debian/changelog | 4 ++++ policy.sgml | 9 +-------- upgrading-checklist.html | 2 ++ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index ca67d90..06e118f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,10 @@ debian-policy (3.8.0.0) unstable; urgency=low Seconded: Manoj Srivastava Seconded: Guillem Jover Closes: #186700, #458910 + * Policy: remove obsolete app-defaults and Xresources provisions + Wording: Julien Cristau + Seconded: Russ Allbery + Closes: #480551 * Bug fix: "Examples of dpkg frontends should mention apt now", thanks to Josh Triplett (Closes: #455602). * Bug fix: "Minor typos and wording suggestions", thanks to Michael diff --git a/policy.sgml b/policy.sgml index b7ac92e..5a5e6c2 100644 --- a/policy.sgml +++ b/policy.sgml @@ -8485,8 +8485,7 @@ name ["syshostname"]: in the X Toolkit Intrinsics - C Language Interface manual is also permitted). They must be registered as conffiles or handled as - configuration files. Packages must not provide the - directory /usr/X11R6/lib/X11/app-defaults/. + configuration files.

@@ -8502,12 +8501,6 @@ name ["syshostname"]: are stored in the X server and affect all connecting clients. - Important: packages that install files into the - /etc/X11/Xresources/ directory must conflict with - xbase (<< 3.3.2.3a-2); if this is not done - it is possible for the installing package to destroy a - previously-existing /etc/X11/Xresources file - which had been customized by the system administrator.

diff --git a/upgrading-checklist.html b/upgrading-checklist.html index 59423cb..efaad46 100644 --- a/upgrading-checklist.html +++ b/upgrading-checklist.html @@ -93,6 +93,8 @@ picking your way through this list. * Files in /etc/cron.{hourly,daily,weekly,monthly} must be configuration files (upgraded from should). Mention the hourly directory. [9.5] + * Packages providing /etc/X11/Xresources files need not conflict with + xbase (<< 3.3.2.3a-2), which is long-obsolete. [11.8.6] * Manual pages in locale-specific directories should use either the legacy encoding for that directory or UTF-8. Country names should not be included in locale-specific manual page directories unless -- 2.39.5