X Strike Force XFree86 SVN commit: r2234 - trunk/debian
Author: branden
Date: 2005-04-06 22:02:49 -0500 (Wed, 06 Apr 2005)
New Revision: 2234
Modified:
trunk/debian/CHANGESETS
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/xdm.prerm.in
Log:
Fix xdm's prerm script to remove /etc/X11/default-display-manager if the
corresponding debconf question has disappeared (meaning that the last package
which provided that shared template is being removed); this enables a clean
purge of the /etc/X11 directory (among the xfree86 packages, at least).
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2005-04-06 20:43:28 UTC (rev 2233)
+++ trunk/debian/CHANGESETS 2005-04-07 03:02:49 UTC (rev 2234)
@@ -55,4 +55,10 @@
Stop using non-POSIX "local" keyword in shell-lib.sh.
2233
+Fix xdm's prerm script to remove /etc/X11/default-display-manager if the
+corresponding debconf question has disappeared (meaning that the last package
+which provided that shared template is being removed); this enables a clean
+purge of the /etc/X11 directory (among the xfree86 packages, at least).
+ 2234
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-04-06 20:43:28 UTC (rev 2233)
+++ trunk/debian/TODO 2005-04-07 03:02:49 UTC (rev 2234)
@@ -16,8 +16,6 @@
4.3.0.dfsg.1-13
---------------
-* xdm doesn't remove default-display-manager if the corresponding debconf
- question is not registered -- fix its prerm script so it does
* all packages that install anything to /usr/X11R6 need to depend on
xfree86-common
* #285807: fix busted MiscPassMessage() implementation which 1) copies from
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-04-06 20:43:28 UTC (rev 2233)
+++ trunk/debian/changelog 2005-04-07 03:02:49 UTC (rev 2234)
@@ -41,8 +41,14 @@
* Stop using non-POSIX "local" keyword in shell-lib.sh.
- -- Branden Robinson <branden@debian.org> Wed, 6 Apr 2005 15:39:56 -0500
+ * Fix xdm's prerm script to remove /etc/X11/default-display-manager if the
+ corresponding debconf question has disappeared (meaning that the last
+ package which provided that shared template is being removed); this
+ enables a clean purge of the /etc/X11 directory (among the xfree86
+ packages, at least).
+ -- Branden Robinson <branden@debian.org> Wed, 6 Apr 2005 22:02:01 -0500
+
xfree86 (4.3.0.dfsg.1-12) unstable; urgency=medium
* Urgency set to medium due to fix for release-critical bug #295175
Modified: trunk/debian/xdm.prerm.in
===================================================================
--- trunk/debian/xdm.prerm.in 2005-04-06 20:43:28 UTC (rev 2233)
+++ trunk/debian/xdm.prerm.in 2005-04-07 03:02:49 UTC (rev 2234)
@@ -152,6 +152,13 @@
fi
fi
fi
+ else
+ # The debconf question does not still exist (the last package owning it
+ # is being removed); remove the default display manager file if it exists.
+ if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
+ observe "removing $DEFAULT_DISPLAY_MANAGER_FILE"
+ rm "$DEFAULT_DISPLAY_MANAGER_FILE"
+ fi
fi
fi
fi
Reply to: