Author: branden
Date: 2003-09-10 06:04:16 -0500 (Wed, 10 Sep 2003)
New Revision: 497
Removed:
trunk/debian/local/xdm/Xreset
trunk/debian/local/xdm/Xsetup
Modified:
trunk/debian/changelog
trunk/debian/xdm.postinst.in
trunk/debian/xdm.postrm.in
trunk/debian/xdm.preinst.in
Log:
Drop the /etc/X11/xdm/{Xreset,Xsetup} conffiles.
- They can no longer cause problems with xconsole running on multiple
servers. (Closes: #128338)
- debian/local/xdm/{Xreset,Xsetup}: deleted
- debian/xdm.preinst.in: use remove_conffile_prepare()
- debian/xdm.postinst.in: use remove_conffile_commit()
- debian/xdm.postrm.in: use remove_conffile_rollback()
- debian/xdm.{preinst,postrm}.in:
+ update copyright notice
+ add $Id$ expandos
+ set svn:keywords property to "Id"
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-09-10 10:56:46 UTC (rev 496)
+++ trunk/debian/changelog 2003-09-10 11:04:16 UTC (rev 497)
@@ -67,8 +67,16 @@
- don't try to use xmessage if it's not in the path
- don't display the /etc/nologin file if it is zero-length
- -- Branden Robinson <[EMAIL PROTECTED]> Wed, 10 Sep 2003 05:53:39 -0500
+ * Drop the /etc/X11/xdm/{Xreset,Xsetup} conffiles.
+ - They can no longer cause problems with xconsole running on multiple
+ servers. (Closes: #128338)
+ - debian/local/xdm/{Xreset,Xsetup}: deleted
+ - debian/xdm.preinst.in: use remove_conffile_prepare()
+ - 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
+
xfree86 (4.2.1-11) unstable; urgency=medium
* urgency set to medium because bug #206790 bites a lot of people (but,
Deleted: trunk/debian/local/xdm/Xreset
===================================================================
--- trunk/debian/local/xdm/Xreset 2003-09-10 10:56:46 UTC (rev 496)
+++ trunk/debian/local/xdm/Xreset 2003-09-10 11:04:16 UTC (rev 497)
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# /etc/X11/xdm/Xreset
-#
-# This script is run as root after the X session ends.
-
-PATH=$PATH:/usr/bin/X11
-HOSTSERVER=$(echo $DISPLAY | cut -d. -f1)
-PIDFILE=/var/run/xconsole.$HOSTSERVER.pid
-
-if [ -e $PIDFILE ]; then
- PID=$(cat $PIDFILE 2> /dev/null)
- if [ -n "$PID" ]; then
- kill $PID 2> /dev/null
- fi
- rm $PIDFILE
-fi
-
-# remove the utmp entry for the session
-if grep -qs ^use-sessreg /etc/X11/xdm/xdm.options && command -v sessreg > /dev/null
2>&1; then
- sessreg -d -l $DISPLAY -u /var/run/utmp -x /etc/X11/xdm/Xservers $USER
-fi
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=0:
Deleted: trunk/debian/local/xdm/Xsetup
===================================================================
--- trunk/debian/local/xdm/Xsetup 2003-09-10 10:56:46 UTC (rev 496)
+++ trunk/debian/local/xdm/Xsetup 2003-09-10 11:04:16 UTC (rev 497)
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# /etc/X11/xdm/Xsetup
-#
-# This script is run whenever xdm is asked to manage a display.
-
-PATH=$PATH:/usr/bin/X11
-HOSTSERVER=$(echo $DISPLAY | cut -d. -f1)
-PIDFILE=/var/run/xconsole.$HOSTSERVER.pid
-CONSOLEDEV=/dev/xconsole
-
-if [ -e $PIDFILE ]; then
- PID=$(cat $PIDFILE 2> /dev/null)
- if [ -n "$PID" ]; then
- kill $PID 2> /dev/null
- fi
- rm $PIDFILE
-fi
-
-if [ -r $CONSOLEDEV ]; then
- xconsole -geometry 480x130-0-0 -notify -verbose -fn fixed -exitOnFail -file
$CONSOLEDEV &
- echo $! > $PIDFILE
-fi
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=0:
Modified: trunk/debian/xdm.postinst.in
===================================================================
--- trunk/debian/xdm.postinst.in 2003-09-10 10:56:46 UTC (rev 496)
+++ trunk/debian/xdm.postinst.in 2003-09-10 11:04:16 UTC (rev 497)
@@ -24,6 +24,11 @@
rm -r /usr/X11R6/lib/X11/xdm.moved-by-preinst
fi
+# now safe to remove obsolete conffiles
+for F in /etc/X11/xdm/Xreset /etc/X11/xdm/Xsetup; do
+ remove_conffile_commit "$F"
+done
+
# deal with a bug in very old versions of xbase
for DIR in rc0.d rc1.d rc6.d; do
if [ -L /etc/$DIR/K1xdm ]; then
Modified: trunk/debian/xdm.postrm.in
===================================================================
--- trunk/debian/xdm.postrm.in 2003-09-10 10:56:46 UTC (rev 496)
+++ trunk/debian/xdm.postrm.in 2003-09-10 11:04:16 UTC (rev 497)
@@ -1,10 +1,12 @@
#!/bin/sh
# Debian xdm package post-removal script
-# Copyright 1998-2000 Branden Robinson.
+# Copyright 1998--2000, 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=xdm
@@ -17,6 +19,11 @@
rm /usr/X11R6/lib/X11/xdm
mv /usr/X11R6/lib/X11/xdm.moved-by-preinst /usr/X11R6/lib/X11/xdm
fi
+
+ # roll back removal of obsolete conffiles
+ for F in /etc/X11/xdm/Xreset /etc/X11/xdm/Xsetup; do
+ remove_conffile_rollback "$F"
+ done
fi
#DEBHELPER#
Property changes on: trunk/debian/xdm.postrm.in
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/debian/xdm.preinst.in
===================================================================
--- trunk/debian/xdm.preinst.in 2003-09-10 10:56:46 UTC (rev 496)
+++ trunk/debian/xdm.preinst.in 2003-09-10 11:04:16 UTC (rev 497)
@@ -1,10 +1,12 @@
#!/bin/sh
# Debian xdm 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=xdm
@@ -27,6 +29,12 @@
fi
fi
+ # default Xreset and Xsetup conffiles went away in 4.2.1-12
+ if dpkg --compare-versions "$2" lt "4.2.1-12"; then
+ remove_conffile_prepare /etc/X11/xdm/Xreset d65cd850f647f7f3d6a076273a3bbb1f
+ remove_conffile_prepare /etc/X11/xdm/Xsetup 9e68b23946b72af86f88593394ba9339
+ fi
+
check_symlinks_and_warn /usr/X11R6/lib/X11/xdm
fi
Property changes on: trunk/debian/xdm.preinst.in
___________________________________________________________________
Name: svn:keywords
+ Id
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
