Author: branden
Date: 2003-10-08 23:24:24 -0500 (Wed, 08 Oct 2003)
New Revision: 639
Modified:
trunk/debian/changelog
trunk/debian/xserver-xfree86.preinst.in
Log:
Remove redundant test for the existence of the XFree86 X server
configuration file from the xserver-xfree86 pre-installation script.
- debian/xserver-xfree86.preinst.in
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-10-09 04:18:14 UTC (rev 638)
+++ trunk/debian/changelog 2003-10-09 04:24:24 UTC (rev 639)
@@ -37,8 +37,12 @@
nothing. (Closes: #214804)
- debian/xbase-clients.preinst.in
- -- Branden Robinson <[EMAIL PROTECTED]> Wed, 8 Oct 2003 23:16:00 -0500
+ * Remove redundant test for the existence of the XFree86 X server
+ configuration file from the xserver-xfree86 pre-installation script.
+ - debian/xserver-xfree86.preinst.in
+ -- Branden Robinson <[EMAIL PROTECTED]> Wed, 8 Oct 2003 23:23:24 -0500
+
xfree86 (4.2.1-12.1) unstable; urgency=low
* Fix typo in xlibs preinst. Closes: #213774, #213776
Modified: trunk/debian/xserver-xfree86.preinst.in
===================================================================
--- trunk/debian/xserver-xfree86.preinst.in 2003-10-09 04:18:14 UTC (rev
638)
+++ trunk/debian/xserver-xfree86.preinst.in 2003-10-09 04:24:24 UTC (rev
639)
@@ -93,24 +93,21 @@
# the file
if db_get xserver-xfree86/manage_config_with_debconf; then
if [ "$RET" = "true" ]; then
- # if the config file doesn't even exist, don't bother
- if [ -e "$XF86CONFIG" ]; then
- # make sure the "debconf markers" are there, too; if they've
- # been removed, the user didn't want the file molested
- if egrep -q '^### BEGIN DEBCONF SECTION' "$XF86CONFIG" &&
- egrep -q '^### END DEBCONF SECTION' "$XF86CONFIG"; then
- # finally, people were letting debconf "manage" the config
- # file even though they complained when it did so and did not
- # follow the instructions that would make the maintainer
- # scripts ignore it, so store a backup so they can rescue
- # themselves from their own ignorance
- message "Note: migrating $XF86CONFIG away from management" \
- "by debconf; backup stored in" \
- "$XF86CONFIG.dpkg-old and checksum stored in" \
- "$XF86CONFIG_CHECKSUM."
- md5sum "$XF86CONFIG" > "$XF86CONFIG_CHECKSUM"
- cp "$XF86CONFIG" "$XF86CONFIG.dpkg-old"
- fi
+ # make sure the "debconf markers" are there, too; if they've
+ # been removed, the user didn't want the file molested
+ if egrep -q '^### BEGIN DEBCONF SECTION' "$XF86CONFIG" &&
+ egrep -q '^### END DEBCONF SECTION' "$XF86CONFIG"; then
+ # finally, people were letting debconf "manage" the config
+ # file even though they complained when it did so and did not
+ # follow the instructions that would make the maintainer
+ # scripts ignore it, so store a backup so they can rescue
+ # themselves from their own ignorance
+ message "Note: migrating $XF86CONFIG away from management" \
+ "by debconf; backup stored in" \
+ "$XF86CONFIG.dpkg-old and checksum stored in" \
+ "$XF86CONFIG_CHECKSUM."
+ md5sum "$XF86CONFIG" > "$XF86CONFIG_CHECKSUM"
+ cp "$XF86CONFIG" "$XF86CONFIG.dpkg-old"
fi
fi
fi
