X Strike Force XFree86 SVN commit: r1963 - trunk/debian
Author: branden
Date: 2004-10-18 11:35:23 -0500 (Mon, 18 Oct 2004)
New Revision: 1963
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/xserver-common.preinst.in
trunk/debian/xserver-xfree86.preinst.in
Log:
Use run() to unregister obsolete debconf templates in xserver-xfree86,
since failure to do so is not fatal, and will occur if we are upgrading
from a version of the package so old (pre-woody unstable) that the
templates don't exist to be unregistered. Thanks to Florian Laws for
diagnosing this bug. (Closes: #275710)
Update comments to document why run() is used with db_unregister.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-10-18 10:58:49 UTC (rev 1962)
+++ trunk/debian/CHANGESETS 2004-10-18 16:35:23 UTC (rev 1963)
@@ -167,4 +167,11 @@
Vincent McIntyre for prompting this. (Closes: #241566)
1962
+Use run() to unregister obsolete debconf templates in xserver-xfree86,
+since failure to do so is not fatal, and will occur if we are upgrading
+from a version of the package so old (pre-woody unstable) that the
+templates don't exist to be unregistered. Thanks to Florian Laws for
+diagnosing this bug. (Closes: #275710)
+ 1963
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-10-18 10:58:49 UTC (rev 1962)
+++ trunk/debian/changelog 2004-10-18 16:35:23 UTC (rev 1963)
@@ -72,6 +72,12 @@
extension has on command-line option and X resource handling. Thanks to
Vincent McIntyre for prompting this. (Closes: #241566)
+ * Use run() to unregister obsolete debconf templates in xserver-xfree86,
+ since failure to do so is not fatal, and will occur if we are upgrading
+ from a version of the package so old (pre-woody unstable) that the
+ templates don't exist to be unregistered. Thanks to Florian Laws for
+ diagnosing this bug. (Closes: #275710)
+
Changes by Denis Barbier and Fabio M. Di Nitto:
* Edit xc/programs/xkbcomp/symbols/pc/Imakefile so that the new pc/us_intl
@@ -142,7 +148,7 @@
+ Set UseBios default to "no" for PROSAVAGE_DDR and PROSAVAGE_DDRK, as
described at <URL: http://www.probo.com/timr/savage40.html >.
- -- Branden Robinson <branden@debian.org> Mon, 18 Oct 2004 05:55:52 -0500
+ -- Branden Robinson <branden@debian.org> Mon, 18 Oct 2004 11:34:10 -0500
xfree86 (4.3.0.dfsg.1-8) unstable; urgency=high
Modified: trunk/debian/xserver-common.preinst.in
===================================================================
--- trunk/debian/xserver-common.preinst.in 2004-10-18 10:58:49 UTC (rev 1962)
+++ trunk/debian/xserver-common.preinst.in 2004-10-18 16:35:23 UTC (rev 1963)
@@ -92,7 +92,8 @@
fi
fi
fi
- # in other news, unregister the now no-longer-used templates
+ # Unregister the now-unused debconf templates. Use run() since failure
+ # to unregister them is not harmful.
run db_unregister xserver-common/manage_config_with_debconf
run db_unregister xserver-common/move_existing_nondebconf_config
fi
Modified: trunk/debian/xserver-xfree86.preinst.in
===================================================================
--- trunk/debian/xserver-xfree86.preinst.in 2004-10-18 10:58:49 UTC (rev 1962)
+++ trunk/debian/xserver-xfree86.preinst.in 2004-10-18 16:35:23 UTC (rev 1963)
@@ -128,11 +128,11 @@
fi
fi
-
- # in other news, unregister the now no-longer-used templates
- db_unregister shared/clobber_x-server_symlink
- db_unregister xserver-xfree86/manage_config_with_debconf
- db_unregister xserver-xfree86/move_existing_nondebconf_config
+ # Unregister the now-unused debconf templates. Use run() since failure
+ # to unregister them is not harmful.
+ run db_unregister shared/clobber_x-server_symlink
+ run db_unregister xserver-xfree86/manage_config_with_debconf
+ run db_unregister xserver-xfree86/move_existing_nondebconf_config
fi
fi
Reply to: