Author: branden
Date: 2004-10-18 13:03:43 -0500 (Mon, 18 Oct 2004)
New Revision: 1966
Added:
trunk/debian/local/xdm/Xreset
Modified:
trunk/debian/CHANGESETS
trunk/debian/MANIFEST.alpha.in
trunk/debian/MANIFEST.amd64.in
trunk/debian/MANIFEST.arm.in
trunk/debian/MANIFEST.hppa.in
trunk/debian/MANIFEST.hurd-i386.in
trunk/debian/MANIFEST.i386.in
trunk/debian/MANIFEST.ia64.in
trunk/debian/MANIFEST.m68k.in
trunk/debian/MANIFEST.mips.in
trunk/debian/MANIFEST.mipsel.in
trunk/debian/MANIFEST.powerpc.in
trunk/debian/MANIFEST.s390.in
trunk/debian/MANIFEST.sparc.in
trunk/debian/changelog
trunk/debian/local/xdm/Xstartup
trunk/debian/xdm.README.Debian
trunk/debian/xdm.install
trunk/debian/xdm.postinst.in
trunk/debian/xdm.postrm.in
trunk/debian/xdm.preinst.in
Log:
Restore xdm's Xreset script, which was removed in 4.2.1-12. If the
use-sessreg option is set and the sessreg command is available, user X
sessions will be de-registered from the utmp and wtmp files again.
Update maintainer scripts to stop removing the conffile. Update
xdm.install and MANIFEST.* files to ship Xreset script. The old
xconsole-related logic is not restored. (Closes: #275329)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-10-18 17:51:10 UTC (rev 1965)
+++ trunk/debian/CHANGESETS 2004-10-18 18:03:43 UTC (rev 1966)
@@ -182,4 +182,12 @@
the XHTML version of the FAQ.
1965
+Restore xdm's Xreset script, which was removed in 4.2.1-12. If the
+use-sessreg option is set and the sessreg command is available, user X
+sessions will be de-registered from the utmp and wtmp files again.
+Update maintainer scripts to stop removing the conffile. Update
+xdm.install and MANIFEST.* files to ship Xreset script. The old
+xconsole-related logic is not restored. (Closes: #275329)
+ 1966
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/MANIFEST.alpha.in
===================================================================
--- trunk/debian/MANIFEST.alpha.in 2004-10-18 17:51:10 UTC (rev 1965)
+++ trunk/debian/MANIFEST.alpha.in 2004-10-18 18:03:43 UTC (rev 1966)
@@ -65,6 +65,7 @@
etc/X11/xdm/GiveConsole
etc/X11/xdm/TakeConsole
etc/X11/xdm/Xaccess
+etc/X11/xdm/Xreset
etc/X11/xdm/Xresources
etc/X11/xdm/Xservers
etc/X11/xdm/Xsession
Modified: trunk/debian/MANIFEST.amd64.in
===================================================================
--- trunk/debian/MANIFEST.amd64.in 2004-10-18 17:51:10 UTC (rev 1965)
+++ trunk/debian/MANIFEST.amd64.in 2004-10-18 18:03:43 UTC (rev 1966)
@@ -65,6 +65,7 @@
etc/X11/xdm/GiveConsole
etc/X11/xdm/TakeConsole
etc/X11/xdm/Xaccess
+etc/X11/xdm/Xreset
etc/X11/xdm/Xresources
etc/X11/xdm/Xservers
etc/X11/xdm/Xsession
Modified: trunk/debian/MANIFEST.arm.in
===================================================================
--- trunk/debian/MANIFEST.arm.in 2004-10-18 17:51:10 UTC (rev 1965)
+++ trunk/debian/MANIFEST.arm.in 2004-10-18 18:03:43 UTC (rev 1966)
@@ -65,6 +65,7 @@
etc/X11/xdm/GiveConsole
etc/X11/xdm/TakeConsole
etc/X11/xdm/Xaccess
+etc/X11/xdm/Xreset
etc/X11/xdm/Xresources
etc/X11/xdm/Xservers
etc/X11/xdm/Xsession
Modified: trunk/debian/MANIFEST.hppa.in
===================================================================
--- trunk/debian/MANIFEST.hppa.in 2004-10-18 17:51:10 UTC (rev 1965)
+++ trunk/debian/MANIFEST.hppa.in 2004-10-18 18:03:43 UTC (rev 1966)
@@ -65,6 +65,7 @@
etc/X11/xdm/GiveConsole
etc/X11/xdm/TakeConsole
etc/X11/xdm/Xaccess
+etc/X11/xdm/Xreset
etc/X11/xdm/Xresources
etc/X11/xdm/Xservers
etc/X11/xdm/Xsession
Modified: trunk/debian/MANIFEST.hurd-i386.in
===================================================================
--- trunk/debian/MANIFEST.hurd-i386.in 2004-10-18 17:51:10 UTC (rev 1965)
+++ trunk/debian/MANIFEST.hurd-i386.in 2004-10-18 18:03:43 UTC (rev 1966)
@@ -65,6 +65,7 @@
etc/X11/xdm/GiveConsole
etc/X11/xdm/TakeConsole
etc/X11/xdm/Xaccess
+etc/X11/xdm/Xreset
etc/X11/xdm/Xresources
etc/X11/xdm/Xservers
etc/X11/xdm/Xsession
Modified: trunk/debian/MANIFEST.i386.in
===================================================================
--- trunk/debian/MANIFEST.i386.in 2004-10-18 17:51:10 UTC (rev 1965)
+++ trunk/debian/MANIFEST.i386.in 2004-10-18 18:03:43 UTC (rev 1966)
@@ -65,6 +65,7 @@
etc/X11/xdm/GiveConsole
etc/X11/xdm/TakeConsole
etc/X11/xdm/Xaccess
+etc/X11/xdm/Xreset
etc/X11/xdm/Xresources
etc/X11/xdm/Xservers
etc/X11/xdm/Xsession
Modified: trunk/debian/MANIFEST.ia64.in
===================================================================
--- trunk/debian/MANIFEST.ia64.in 2004-10-18 17:51:10 UTC (rev 1965)
+++ trunk/debian/MANIFEST.ia64.in 2004-10-18 18:03:43 UTC (rev 1966)
@@ -65,6 +65,7 @@
etc/X11/xdm/GiveConsole
etc/X11/xdm/TakeConsole
etc/X11/xdm/Xaccess
+etc/X11/xdm/Xreset
etc/X11/xdm/Xresources
etc/X11/xdm/Xservers
etc/X11/xdm/Xsession
Modified: trunk/debian/MANIFEST.m68k.in
===================================================================
--- trunk/debian/MANIFEST.m68k.in 2004-10-18 17:51:10 UTC (rev 1965)
+++ trunk/debian/MANIFEST.m68k.in 2004-10-18 18:03:43 UTC (rev 1966)
@@ -65,6 +65,7 @@
etc/X11/xdm/GiveConsole
etc/X11/xdm/TakeConsole
etc/X11/xdm/Xaccess
+etc/X11/xdm/Xreset
etc/X11/xdm/Xresources
etc/X11/xdm/Xservers
etc/X11/xdm/Xsession
Modified: trunk/debian/MANIFEST.mips.in
===================================================================
--- trunk/debian/MANIFEST.mips.in 2004-10-18 17:51:10 UTC (rev 1965)
+++ trunk/debian/MANIFEST.mips.in 2004-10-18 18:03:43 UTC (rev 1966)
@@ -65,6 +65,7 @@
etc/X11/xdm/GiveConsole
etc/X11/xdm/TakeConsole
etc/X11/xdm/Xaccess
+etc/X11/xdm/Xreset
etc/X11/xdm/Xresources
etc/X11/xdm/Xservers
etc/X11/xdm/Xsession
Modified: trunk/debian/MANIFEST.mipsel.in
===================================================================
--- trunk/debian/MANIFEST.mipsel.in 2004-10-18 17:51:10 UTC (rev 1965)
+++ trunk/debian/MANIFEST.mipsel.in 2004-10-18 18:03:43 UTC (rev 1966)
@@ -65,6 +65,7 @@
etc/X11/xdm/GiveConsole
etc/X11/xdm/TakeConsole
etc/X11/xdm/Xaccess
+etc/X11/xdm/Xreset
etc/X11/xdm/Xresources
etc/X11/xdm/Xservers
etc/X11/xdm/Xsession
Modified: trunk/debian/MANIFEST.powerpc.in
===================================================================
--- trunk/debian/MANIFEST.powerpc.in 2004-10-18 17:51:10 UTC (rev 1965)
+++ trunk/debian/MANIFEST.powerpc.in 2004-10-18 18:03:43 UTC (rev 1966)
@@ -65,6 +65,7 @@
etc/X11/xdm/GiveConsole
etc/X11/xdm/TakeConsole
etc/X11/xdm/Xaccess
+etc/X11/xdm/Xreset
etc/X11/xdm/Xresources
etc/X11/xdm/Xservers
etc/X11/xdm/Xsession
Modified: trunk/debian/MANIFEST.s390.in
===================================================================
--- trunk/debian/MANIFEST.s390.in 2004-10-18 17:51:10 UTC (rev 1965)
+++ trunk/debian/MANIFEST.s390.in 2004-10-18 18:03:43 UTC (rev 1966)
@@ -60,6 +60,7 @@
etc/X11/xdm/GiveConsole
etc/X11/xdm/TakeConsole
etc/X11/xdm/Xaccess
+etc/X11/xdm/Xreset
etc/X11/xdm/Xresources
etc/X11/xdm/Xservers
etc/X11/xdm/Xsession
Modified: trunk/debian/MANIFEST.sparc.in
===================================================================
--- trunk/debian/MANIFEST.sparc.in 2004-10-18 17:51:10 UTC (rev 1965)
+++ trunk/debian/MANIFEST.sparc.in 2004-10-18 18:03:43 UTC (rev 1966)
@@ -65,6 +65,7 @@
etc/X11/xdm/GiveConsole
etc/X11/xdm/TakeConsole
etc/X11/xdm/Xaccess
+etc/X11/xdm/Xreset
etc/X11/xdm/Xresources
etc/X11/xdm/Xservers
etc/X11/xdm/Xsession
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-10-18 17:51:10 UTC (rev 1965)
+++ trunk/debian/changelog 2004-10-18 18:03:43 UTC (rev 1966)
@@ -84,6 +84,13 @@
dh_compress will take care of that. Tell dh_compress to avoid compressing
the XHTML version of the FAQ.
+ * Restore xdm's Xreset script, which was removed in 4.2.1-12. If the
+ use-sessreg option is set and the sessreg command is available, user X
+ sessions will be de-registered from the utmp and wtmp files again.
+ Update maintainer scripts to stop removing the conffile. Update
+ xdm.install and MANIFEST.* files to ship Xreset script. The old
+ xconsole-related logic is not restored. (Closes: #275329)
+
Changes by Denis Barbier and Fabio M. Di Nitto:
* Edit xc/programs/xkbcomp/symbols/pc/Imakefile so that the new pc/us_intl
@@ -154,7 +161,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 <[EMAIL PROTECTED]> Mon, 18 Oct 2004 12:50:05 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Mon, 18 Oct 2004 12:57:18 -0500
xfree86 (4.3.0.dfsg.1-8) unstable; urgency=high
Copied: trunk/debian/local/xdm/Xreset (from rev 496,
trunk/debian/local/xdm/Xreset)
===================================================================
--- trunk/debian/local/xdm/Xreset 2003-09-10 10:56:46 UTC (rev 496)
+++ trunk/debian/local/xdm/Xreset 2004-10-18 18:03:43 UTC (rev 1966)
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# $Id$
+#
+# This script is run as root after the user's X session ends.
+
+PATH="$PATH:/usr/bin/X11"
+
+# Remove the utmp entry for the session.
+if grep -qs '^use-sessreg' /etc/X11/xdm/xdm.options \
+ && which 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=4 sw=4 tw=80:
Property changes on: trunk/debian/local/xdm/Xreset
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/debian/local/xdm/Xstartup
===================================================================
--- trunk/debian/local/xdm/Xstartup 2004-10-18 17:51:10 UTC (rev 1965)
+++ trunk/debian/local/xdm/Xstartup 2004-10-18 18:03:43 UTC (rev 1966)
@@ -18,14 +18,14 @@
fi
fi
-# insert a utmp entry for the session
-if grep -qs '^use-sessreg' /etc/X11/xdm/xdm.options && \
- which sessreg > /dev/null 2>&1; then
- exec sessreg -a -l "$DISPLAY" -u /var/run/utmp \
- -x /etc/X11/xdm/Xservers "$USER"
+# Insert a utmp entry for the session.
+if grep -qs '^use-sessreg' /etc/X11/xdm/xdm.options \
+ && which sessreg >/dev/null 2>&1; then
+ exec sessreg -a -l "$DISPLAY" -u /var/run/utmp
+ -x /etc/X11/xdm/Xservers "$USER"
# NOTREACHED
fi
exit 0
-# vim:set ai et sts=2 sw=2 tw=0:
+# vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/xdm.README.Debian
===================================================================
--- trunk/debian/xdm.README.Debian 2004-10-18 17:51:10 UTC (rev 1965)
+++ trunk/debian/xdm.README.Debian 2004-10-18 18:03:43 UTC (rev 1966)
@@ -49,6 +49,9 @@
Xstartup is a shell script which is run (as root) after a user has logged in
on a server.
+Xreset is a shell script which is run (as root) after a user's X session ends
on
+a server.
+
xdm.options contains configuration options for xdm that are specific to the
Debian GNU/Linux system. See the xdm.options(5) manual page for more
information.
Modified: trunk/debian/xdm.install
===================================================================
--- trunk/debian/xdm.install 2004-10-18 17:51:10 UTC (rev 1965)
+++ trunk/debian/xdm.install 2004-10-18 18:03:43 UTC (rev 1966)
@@ -1,5 +1,6 @@
etc/X11/app-defaults/Chooser
etc/X11/xdm/Xaccess
+etc/X11/xdm/Xreset
etc/X11/xdm/Xresources
etc/X11/xdm/Xservers
etc/X11/xdm/Xsession
Modified: trunk/debian/xdm.postinst.in
===================================================================
--- trunk/debian/xdm.postinst.in 2004-10-18 17:51:10 UTC (rev 1965)
+++ trunk/debian/xdm.postinst.in 2004-10-18 18:03:43 UTC (rev 1966)
@@ -25,10 +25,8 @@
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
+# It is now safe to remove obsolete conffiles.
+remove_conffile_commit /etc/X11/xdm/Xsetup
# debconf is not a registry, so we only fiddle with the default file if it
# does not exist
Modified: trunk/debian/xdm.postrm.in
===================================================================
--- trunk/debian/xdm.postrm.in 2004-10-18 17:51:10 UTC (rev 1965)
+++ trunk/debian/xdm.postrm.in 2004-10-18 18:03:43 UTC (rev 1966)
@@ -21,10 +21,8 @@
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
+ # Roll back removal of obsolete conffiles.
+ remove_conffile_rollback /etc/X11/xdm/Xsetup
# roll back displacement of default display manager file
if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then
Modified: trunk/debian/xdm.preinst.in
===================================================================
--- trunk/debian/xdm.preinst.in 2004-10-18 17:51:10 UTC (rev 1965)
+++ trunk/debian/xdm.preinst.in 2004-10-18 18:03:43 UTC (rev 1966)
@@ -45,9 +45,8 @@
fi
fi
- # default Xreset and Xsetup conffiles went away in 4.2.1-12
+ # The Xsetup conffile 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
