Author: branden
Date: 2003-09-10 06:57:29 -0500 (Wed, 10 Sep 2003)
New Revision: 498
Modified:
trunk/debian/changelog
trunk/debian/xbase-clients.preinst.in
Log:
debian/xbase-clients.preinst.in: a bit of cleanup;
- rewrite deregistration of obsolete ancient xconsole alternative to only
take place on upgrades from extremely old installations, and fix up
usage of update-alternatives (see #164021)
- move workaround for bug #28519 into the main conditional block
- add $Id$ expando
- update copyright notice
- set svn:keywords property to "Id"
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-09-10 11:04:16 UTC (rev 497)
+++ trunk/debian/changelog 2003-09-10 11:57:29 UTC (rev 498)
@@ -75,8 +75,14 @@
- debian/xdm.postinst.in: use remove_conffile_commit()
- debian/xdm.postrm.in: use remove_conffile_rollback()
- -- Branden Robinson <[EMAIL PROTECTED]> Wed, 10 Sep 2003 05:57:23 -0500
+ * debian/xbase-clients.preinst.in: a bit of cleanup;
+ - rewrite deregistration of obsolete ancient xconsole alternative to only
+ take place on upgrades from extremely old installations, and fix up
+ usage of update-alternatives (see #164021)
+ - move workaround for bug #28519 into the main conditional block
+ -- Branden Robinson <[EMAIL PROTECTED]> Wed, 10 Sep 2003 06:53:52 -0500
+
xfree86 (4.2.1-11) unstable; urgency=medium
* urgency set to medium because bug #206790 bites a lot of people (but,
Modified: trunk/debian/xbase-clients.preinst.in
===================================================================
--- trunk/debian/xbase-clients.preinst.in 2003-09-10 11:04:16 UTC (rev
497)
+++ trunk/debian/xbase-clients.preinst.in 2003-09-10 11:57:29 UTC (rev
498)
@@ -1,10 +1,12 @@
#!/bin/sh
# Debian xbase-clients package pre-installation script
-# Copyright 1998-2001 Branden Robinson.
+# Copyright 1998--2001, 2003 Branden Robinson.
# Licensed under the GNU General Public License, version 2. See the file
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+# $Id$
+
set -e
THIS_PACKAGE=xbase-clients
@@ -31,20 +33,21 @@
rm -r /var/state/xkb
fi
- # XXX: horrible, horrible, horrible; update-alternatives is utter crap
- if ! $(LC_ALL=C update-alternatives --display xconsole | grep -q "^No"); then
- update-alternatives --remove xconsole /usr/X11R6/bin/xconsole.real
- fi
-fi
-
-# workaround for dpkg craziness (#28519)
-if [ "$1" = "upgrade" ]; then
- if dpkg --compare-versions "$2" le "3.3.2.3a-1"; then
+ # workaround for dpkg craziness (#28519)
+ if dpkg --compare-versions "$2" lt "3.3.2.3a-1"; then
if [ -L /etc/X11/xinit/xinitrc -a $(readlink /etc/X11/xinitrc) =
"../Xsession" ]; then
message "Note: Removing obsolete symbolic link /etc/X11/xinit/xinitrc."
rm /etc/X11/xinit/xinitrc
fi
fi
+
+ # xconsole stopped being an alternative when Xaw wrappers died
+ if dpkg --compare-versions "$2" lt "3.3.4-1"; then
+ if ! update-alternatives --display xconsole | \
+ fgrep -q /usr/X11R6/bin/xconsole.real; then
+ update-alternatives --remove xconsole /usr/X11R6/bin/xconsole.real
+ fi
+ fi
fi
#DEBHELPER#
Property changes on: trunk/debian/xbase-clients.preinst.in
___________________________________________________________________
Name: svn:keywords
+ Id
