X Strike Force X.Org X11 SVN commit: r947 - trunk/debian
Author: dnusinow
Date: 2005-12-15 14:52:49 -0500 (Thu, 15 Dec 2005)
New Revision: 947
Modified:
trunk/debian/changelog
trunk/debian/x11-common.postinst.in
trunk/debian/x11-common.preinst.in
Log:
* Remove non-modified /etc/X11/rgb.txt on x11-common's preinst, not
postinst. The recommendation to remove it in postinst was for obsolete
conffiles, but this file is not obsolete, and removing it in the postinst
will cause the new version to be deleted. Removing it in the preinst
should solve this issue, although it will cause issues if the upgrade
fails and if the user has modified the file. (closes: #343389)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-12-14 21:36:27 UTC (rev 946)
+++ trunk/debian/changelog 2005-12-15 19:52:49 UTC (rev 947)
@@ -1,5 +1,6 @@
xorg-x11 (6.8.2.dfsg.1-11+SVN) unstable; urgency=low
+ [ David Martínez Moreno ]
* general/033_radeon_fix_for_no_accel.diff: A bug into one of ati driver's
sources (radeon_video.c) causes Xorg server to crash when using it with
option "NoAccel", due to erroneous dereferencing of uninitialized pointer.
@@ -7,8 +8,16 @@
* debian/control: Rephrased the description in x11-common package. Thanks,
Denis Barbier.
- -- David Martínez Moreno <ender@debian.org> Fri, 9 Dec 2005 11:47:09 +0100
+ [ David Nusinow ]
+ * Remove non-modified /etc/X11/rgb.txt on x11-common's preinst, not
+ postinst. The recommendation to remove it in postinst was for obsolete
+ conffiles, but this file is not obsolete, and removing it in the postinst
+ will cause the new version to be deleted. Removing it in the preinst
+ should solve this issue, although it will cause issues if the upgrade
+ fails and if the user has modified the file. (closes: #343389)
+ -- David Nusinow <dnusinow@debian.org> Thu, 15 Dec 2005 14:42:21 -0500
+
xorg-x11 (6.8.2.dfsg.1-11) unstable; urgency=low
[ David Nusinow ]
Modified: trunk/debian/x11-common.postinst.in
===================================================================
--- trunk/debian/x11-common.postinst.in 2005-12-14 21:36:27 UTC (rev 946)
+++ trunk/debian/x11-common.postinst.in 2005-12-15 19:52:49 UTC (rev 947)
@@ -35,7 +35,6 @@
remove_conffile_commit /etc/X11/Xsession.d/90xfree86-common_ssh-agent
remove_conffile_commit /etc/X11/Xsession.d/99xfree86-common_start
remove_conffile_commit /etc/X11/Xsession.options
-remove_conffile_commit /etc/X11/rgb.txt
remove_conffile_commit /etc/init.d/xfree86-common
if [ -e /etc/init.d/x11-common ]; then
Modified: trunk/debian/x11-common.preinst.in
===================================================================
--- trunk/debian/x11-common.preinst.in 2005-12-14 21:36:27 UTC (rev 946)
+++ trunk/debian/x11-common.preinst.in 2005-12-15 19:52:49 UTC (rev 947)
@@ -68,6 +68,9 @@
4896b3e3380a6a2af1920709bc31b140
remove_conffile_prepare /etc/init.d/xfree86-common \
034165e48abb370e9c3e276850755219
+ # We have to remove non-obsolete conffiles here, rather than postinst,
+ # because otherwise they get deleted prematurely
+ remove_conffile_commit /etc/X11/rgb.txt
fi
check_symlinks_and_warn /usr/bin/X11 \
Reply to: