X Strike Force SVN commit: rev 370 - trunk/debian
Author: branden
Date: 2003-08-06 01:33:33 -0500 (Wed, 06 Aug 2003)
New Revision: 370
Modified:
trunk/debian/changelog
trunk/debian/control
trunk/debian/xserver-common.postinst.in
Log:
xserver-common's postinst script no longer needs to ensure sanity of the X
server's socket directory since xfree86-common's init script does that now.
- debian/control: increment xserver-common's versioned dependency on
xfree86-common from (>> 4.2) to (>= 4.2.1-5) so we can rely on its init
script to handle the server's socket directory for us
- debian/xserver-common.postinst.in: stop manipulating X server socket
directory
debian/xserver-common.postinst.in:
- (cosmetic) update copyright notice
- set svn:keywords property to "Id" on this file
- add $Id$ expando
Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog 2003-08-05 07:09:39 UTC (rev 369)
+++ trunk/debian/changelog 2003-08-06 06:33:33 UTC (rev 370)
@@ -126,8 +126,17 @@
* debian/local/FAQ: add more information about left-handed mouse use for gpm
users, courtesy of Osamu Aoki (Closes: #181579)
- -- Branden Robinson <branden@debian.org> Tue, 5 Aug 2003 02:08:39 -0500
+ * xserver-common's postinst script no longer needs to ensure sanity of the X
+ server's socket directory since xfree86-common's init script does that
+ now.
+ - debian/control: increment xserver-common's versioned dependency on
+ xfree86-common from (>> 4.2) to (>= 4.2.1-5) so we can rely on its init
+ script to handle the server's socket directory for us
+ - debian/xserver-common.postinst.in: stop manipulating X server socket
+ directory
+ -- Branden Robinson <branden@debian.org> Wed, 6 Aug 2003 01:28:24 -0500
+
xfree86 (4.2.1-9) unstable; urgency=high
* urgency due to xterm security fixes; see below
Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control 2003-08-05 07:09:39 UTC (rev 369)
+++ trunk/debian/control 2003-08-06 06:33:33 UTC (rev 370)
@@ -858,7 +858,7 @@
Package: xserver-common
Architecture: any
-Depends: debconf (>= 1.0.21), xfree86-common (>> 4.2), ${shlibs:Depends}, ${misc:Depends}
+Depends: debconf (>= 1.0.21), xfree86-common (>= 4.2.1-5), ${shlibs:Depends}, ${misc:Depends}
Suggests: xserver-xfree86 | xserver, xfonts-base, xfonts-100dpi | xfonts-75dpi, xfonts-scalable, configlet-frontends
Conflicts: xbase (<< 3.3.2.3a-2), xsun-utils, xbase-clients (<< 3.3.6-1), suidmanager (<< 0.50), configlet (<= 0.9.22), xserver-3dlabs (<< 3.3.6-35), xserver-8514 (<< 3.3.6-35), xserver-agx (<< 3.3.6-35), xserver-common-v3 (<< 3.3.6-35), xserver-fbdev (<< 3.3.6-35), xserver-i128 (<< 3.3.6-35), xserver-mach32 (<< 3.3.6-35), xserver-mach64 (<< 3.3.6-35), xserver-mach8 (<< 3.3.6-35), xserver-mono (<< 3.3.6-35), xserver-p9000 (<< 3.3.6-35), xserver-s3 (<< 3.3.6-35), xserver-s3v (<< 3.3.6-35), xserver-svga (<< 3.3.6-35), xserver-tga (<< 3.3.6-35), xserver-vga16 (<< 3.3.6-35), xserver-w32 (<< 3.3.6-35), xserver-xsun (<< 3.3.6-35), xserver-xsun-mono (<< 3.3.6-35), xserver-xsun24 (<< 3.3.6-35), xserver-rage128, xserver-sis
Replaces: xbase (<< 3.3.2.3a-2), xserver-vga16 (<< 3.3.2.3a-2), xserver-agx (<< 3.3.2.3a-9), xserver-mach32 (<< 3.3.2.3a-9), xserver-mach64 (<< 3.3.2.3a-9), xserver-p9000 (<< 3.3.2.3a-9), xserver-s3 (<< 3.3.2.3a-9), xserver-s3v (<< 3.3.2.3a-9), xserver-tga (<< 3.3.2.3a-9), xserver-w32 (<< 3.3.2.3a-9), xsun-utils
Modified: trunk/debian/xserver-common.postinst.in
==============================================================================
--- trunk/debian/xserver-common.postinst.in 2003-08-05 07:09:39 UTC (rev 369)
+++ trunk/debian/xserver-common.postinst.in 2003-08-06 06:33:33 UTC (rev 370)
@@ -1,10 +1,12 @@
#!/bin/sh
# Debian xserver-common package post-installation script
-# Copyright 1998-2001 Branden Robinson.
+# Copyright 1998--2001 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=xserver-common
@@ -22,12 +24,6 @@
rm -r /usr/X11R6/lib/X11/xserver.moved-by-preinst
fi
-# enforce sanity of X server socket directory
-if [ -d /tmp/.X11-unix ]; then
- chown root:root /tmp/.X11-unix
- chmod a+rwxt /tmp/.X11-unix
-fi
-
#DEBHELPER#
db_get xserver-common/manage_config_with_debconf
Reply to: