X Strike Force SVN commit: rev 335 - trunk/debian
Author: branden
Date: 2003-07-30 12:43:19 -0500 (Wed, 30 Jul 2003)
New Revision: 335
Modified:
trunk/debian/changelog
trunk/debian/xterm.postinst.in
Log:
debian/xterm.postinst.in: only remove the obsolete old xterm alternative if
it is in fact registered; this shouldn't be necessary, but
update-alternatives is buggy, easily confused, and prone to wreak random
havoc (based on a patch by Eduard Bloch -- thanks!) (Closes: #164021)
Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog 2003-07-30 17:02:05 UTC (rev 334)
+++ trunk/debian/changelog 2003-07-30 17:43:19 UTC (rev 335)
@@ -49,8 +49,13 @@
* debian/po/fr.po: update French debconf template translations (thanks,
Christian Perrier) (Closes: #203470)
- -- Branden Robinson <branden@debian.org> Wed, 30 Jul 2003 11:13:03 -0500
+ * debian/xterm.postinst.in: only remove the obsolete old xterm alternative
+ if it is in fact registered; this shouldn't be necessary, but
+ update-alternatives is buggy, easily confused, and prone to wreak random
+ havoc (based on a patch by Eduard Bloch -- thanks!) (Closes: #164021)
+ -- Branden Robinson <branden@debian.org> Wed, 30 Jul 2003 12:39:13 -0500
+
xfree86 (4.2.1-9) unstable; urgency=high
* urgency due to xterm security fixes; see below
Modified: trunk/debian/xterm.postinst.in
==============================================================================
--- trunk/debian/xterm.postinst.in 2003-07-30 17:02:05 UTC (rev 334)
+++ trunk/debian/xterm.postinst.in 2003-07-30 17:43:19 UTC (rev 335)
@@ -19,7 +19,9 @@
--slave /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz /usr/X11R6/man/man1/uxterm.1x.gz
# clean up after older alternative that used different path
-update-alternatives --remove x-terminal-emulator /usr/bin/X11/xterm
+if update-alternatives --display x-terminal-emulator | grep -q /usr/bin/X11/xterm; then
+ update-alternatives --remove x-terminal-emulator /usr/bin/X11/xterm
+fi
#DEBHELPER#
Reply to: