Author: branden
Date: 2003-09-18 16:37:09 -0500 (Thu, 18 Sep 2003)
New Revision: 554
Modified:
trunk/debian/MANIFEST.alpha
trunk/debian/MANIFEST.arm
trunk/debian/MANIFEST.hppa
trunk/debian/MANIFEST.hurd-i386
trunk/debian/MANIFEST.i386
trunk/debian/MANIFEST.ia64
trunk/debian/MANIFEST.m68k
trunk/debian/MANIFEST.mips
trunk/debian/MANIFEST.mipsel
trunk/debian/MANIFEST.netbsd-i386
trunk/debian/MANIFEST.powerpc
trunk/debian/MANIFEST.s390
trunk/debian/MANIFEST.sh3
trunk/debian/MANIFEST.sh4
trunk/debian/MANIFEST.sparc
trunk/debian/changelog
trunk/debian/local/xdm.options.5
trunk/debian/xdm.README.Debian
trunk/debian/xdm.install
Log:
Continue the process of dropping /etc/X11/xdm/{Xreset,Xsetup}.
- debian/MANIFEST.*: drop files from MANIFEST
- debian/local/xdm.README.Debian: stop mentioning no-longer-shipped
Xreset and Xsetup conffiles
- debian/local/xdm.options.5: update wording to reflect fact that Xreset
and Xsetup are no longer part of the package
- debian/xdm.install: drop files from package
Modified: trunk/debian/MANIFEST.alpha
===================================================================
--- trunk/debian/MANIFEST.alpha 2003-09-18 18:37:53 UTC (rev 553)
+++ trunk/debian/MANIFEST.alpha 2003-09-18 21:37:09 UTC (rev 554)
@@ -63,11 +63,9 @@
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
-etc/X11/xdm/Xsetup
etc/X11/xdm/Xsetup_0
etc/X11/xdm/Xstartup
etc/X11/xdm/Xwilling
Modified: trunk/debian/MANIFEST.arm
===================================================================
--- trunk/debian/MANIFEST.arm 2003-09-18 18:37:53 UTC (rev 553)
+++ trunk/debian/MANIFEST.arm 2003-09-18 21:37:09 UTC (rev 554)
@@ -63,11 +63,9 @@
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
-etc/X11/xdm/Xsetup
etc/X11/xdm/Xsetup_0
etc/X11/xdm/Xstartup
etc/X11/xdm/Xwilling
Modified: trunk/debian/MANIFEST.hppa
===================================================================
--- trunk/debian/MANIFEST.hppa 2003-09-18 18:37:53 UTC (rev 553)
+++ trunk/debian/MANIFEST.hppa 2003-09-18 21:37:09 UTC (rev 554)
@@ -63,11 +63,9 @@
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
-etc/X11/xdm/Xsetup
etc/X11/xdm/Xsetup_0
etc/X11/xdm/Xstartup
etc/X11/xdm/Xwilling
Modified: trunk/debian/MANIFEST.hurd-i386
===================================================================
--- trunk/debian/MANIFEST.hurd-i386 2003-09-18 18:37:53 UTC (rev 553)
+++ trunk/debian/MANIFEST.hurd-i386 2003-09-18 21:37:09 UTC (rev 554)
@@ -63,11 +63,9 @@
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
-etc/X11/xdm/Xsetup
etc/X11/xdm/Xsetup_0
etc/X11/xdm/Xstartup
etc/X11/xdm/Xwilling
Modified: trunk/debian/MANIFEST.i386
===================================================================
--- trunk/debian/MANIFEST.i386 2003-09-18 18:37:53 UTC (rev 553)
+++ trunk/debian/MANIFEST.i386 2003-09-18 21:37:09 UTC (rev 554)
@@ -63,11 +63,9 @@
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
-etc/X11/xdm/Xsetup
etc/X11/xdm/Xsetup_0
etc/X11/xdm/Xstartup
etc/X11/xdm/Xwilling
Modified: trunk/debian/MANIFEST.ia64
===================================================================
--- trunk/debian/MANIFEST.ia64 2003-09-18 18:37:53 UTC (rev 553)
+++ trunk/debian/MANIFEST.ia64 2003-09-18 21:37:09 UTC (rev 554)
@@ -63,11 +63,9 @@
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
-etc/X11/xdm/Xsetup
etc/X11/xdm/Xsetup_0
etc/X11/xdm/Xstartup
etc/X11/xdm/Xwilling
Modified: trunk/debian/MANIFEST.m68k
===================================================================
--- trunk/debian/MANIFEST.m68k 2003-09-18 18:37:53 UTC (rev 553)
+++ trunk/debian/MANIFEST.m68k 2003-09-18 21:37:09 UTC (rev 554)
@@ -63,11 +63,9 @@
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
-etc/X11/xdm/Xsetup
etc/X11/xdm/Xsetup_0
etc/X11/xdm/Xstartup
etc/X11/xdm/Xwilling
Modified: trunk/debian/MANIFEST.mips
===================================================================
--- trunk/debian/MANIFEST.mips 2003-09-18 18:37:53 UTC (rev 553)
+++ trunk/debian/MANIFEST.mips 2003-09-18 21:37:09 UTC (rev 554)
@@ -63,11 +63,9 @@
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
-etc/X11/xdm/Xsetup
etc/X11/xdm/Xsetup_0
etc/X11/xdm/Xstartup
etc/X11/xdm/Xwilling
Modified: trunk/debian/MANIFEST.mipsel
===================================================================
--- trunk/debian/MANIFEST.mipsel 2003-09-18 18:37:53 UTC (rev 553)
+++ trunk/debian/MANIFEST.mipsel 2003-09-18 21:37:09 UTC (rev 554)
@@ -63,11 +63,9 @@
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
-etc/X11/xdm/Xsetup
etc/X11/xdm/Xsetup_0
etc/X11/xdm/Xstartup
etc/X11/xdm/Xwilling
Modified: trunk/debian/MANIFEST.netbsd-i386
===================================================================
--- trunk/debian/MANIFEST.netbsd-i386 2003-09-18 18:37:53 UTC (rev 553)
+++ trunk/debian/MANIFEST.netbsd-i386 2003-09-18 21:37:09 UTC (rev 554)
@@ -63,11 +63,9 @@
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
-etc/X11/xdm/Xsetup
etc/X11/xdm/Xsetup_0
etc/X11/xdm/Xstartup
etc/X11/xdm/Xwilling
Modified: trunk/debian/MANIFEST.powerpc
===================================================================
--- trunk/debian/MANIFEST.powerpc 2003-09-18 18:37:53 UTC (rev 553)
+++ trunk/debian/MANIFEST.powerpc 2003-09-18 21:37:09 UTC (rev 554)
@@ -63,11 +63,9 @@
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
-etc/X11/xdm/Xsetup
etc/X11/xdm/Xsetup_0
etc/X11/xdm/Xstartup
etc/X11/xdm/Xwilling
Modified: trunk/debian/MANIFEST.s390
===================================================================
--- trunk/debian/MANIFEST.s390 2003-09-18 18:37:53 UTC (rev 553)
+++ trunk/debian/MANIFEST.s390 2003-09-18 21:37:09 UTC (rev 554)
@@ -62,11 +62,9 @@
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
-etc/X11/xdm/Xsetup
etc/X11/xdm/Xsetup_0
etc/X11/xdm/Xstartup
etc/X11/xdm/Xwilling
Modified: trunk/debian/MANIFEST.sh3
===================================================================
--- trunk/debian/MANIFEST.sh3 2003-09-18 18:37:53 UTC (rev 553)
+++ trunk/debian/MANIFEST.sh3 2003-09-18 21:37:09 UTC (rev 554)
@@ -63,11 +63,9 @@
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
-etc/X11/xdm/Xsetup
etc/X11/xdm/Xsetup_0
etc/X11/xdm/Xstartup
etc/X11/xdm/Xwilling
Modified: trunk/debian/MANIFEST.sh4
===================================================================
--- trunk/debian/MANIFEST.sh4 2003-09-18 18:37:53 UTC (rev 553)
+++ trunk/debian/MANIFEST.sh4 2003-09-18 21:37:09 UTC (rev 554)
@@ -63,11 +63,9 @@
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
-etc/X11/xdm/Xsetup
etc/X11/xdm/Xsetup_0
etc/X11/xdm/Xstartup
etc/X11/xdm/Xwilling
Modified: trunk/debian/MANIFEST.sparc
===================================================================
--- trunk/debian/MANIFEST.sparc 2003-09-18 18:37:53 UTC (rev 553)
+++ trunk/debian/MANIFEST.sparc 2003-09-18 21:37:09 UTC (rev 554)
@@ -63,11 +63,9 @@
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
-etc/X11/xdm/Xsetup
etc/X11/xdm/Xsetup_0
etc/X11/xdm/Xstartup
etc/X11/xdm/Xwilling
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-09-18 18:37:53 UTC (rev 553)
+++ trunk/debian/changelog 2003-09-18 21:37:09 UTC (rev 554)
@@ -75,7 +75,13 @@
* Drop the /etc/X11/xdm/{Xreset,Xsetup} conffiles.
- They can no longer cause problems with xconsole running on multiple
servers. (Closes: #128338)
+ - debian/MANIFEST.*: drop files from MANIFEST
+ - debian/local/xdm.README.Debian: stop mentioning no-longer-shipped
+ Xreset and Xsetup conffiles
+ - debian/local/xdm.options.5: update wording to reflect fact that Xreset
+ and Xsetup are no longer part of the package
- debian/local/xdm/{Xreset,Xsetup}: deleted
+ - debian/xdm.install: drop files from package
- debian/xdm.preinst.in: use remove_conffile_prepare()
- debian/xdm.postinst.in: use remove_conffile_commit()
- debian/xdm.postrm.in: use remove_conffile_rollback()
@@ -208,7 +214,7 @@
xfree86/pc102/fi/nodeadkeys (stock XFree86 4.2.1 works)
(Closes: #189298)
- -- Branden Robinson <[EMAIL PROTECTED]> Fri, 12 Sep 2003 16:12:55 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Thu, 18 Sep 2003 16:28:22 -0500
xfree86 (4.2.1-11) unstable; urgency=medium
Modified: trunk/debian/local/xdm.options.5
===================================================================
--- trunk/debian/local/xdm.options.5 2003-09-18 18:37:53 UTC (rev 553)
+++ trunk/debian/local/xdm.options.5 2003-09-18 21:37:09 UTC (rev 554)
@@ -1,9 +1,10 @@
-.\" This manpage is copyright (C) 1998 Branden Robinson <[EMAIL PROTECTED]>.
+.\" $Id$
.\"
+.\" Copyright 1998, 2002, 2003 Branden Robinson <[EMAIL PROTECTED]>.
+.\"
.\" This is free software; you may redistribute it and/or modify
.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
+.\" published by the Free Software Foundation; version 2.
.\"
.\" This is distributed in the hope that it will be useful, but
.\" WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +15,7 @@
.\" the Debian operating system, in /usr/share/common-licenses/GPL; if
.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
.\" Suite 330, Boston, MA 02111-1307 USA
-.TH xdm.options 5 "2002\-11\-24" "Debian Project"
+.TH xdm.options 5 "2003\-09\-18" "Debian Project"
.SH NAME
xdm.options \- configuration options for X display manager
.SH DESCRIPTION
@@ -70,13 +71,14 @@
xdm sessions.
.PP
Users of older versions of the Debian system should note that the
-\(oqrun\-xconsole\(cq option has been removed. The configurable shell
-scripts
+\(oqrun\-xconsole\(cq option has been removed. Shell scripts named
.I /etc/X11/xdm/Xsetup
and
.I /etc/X11/xdm/Xreset
-may be edited to disable or modify the running of xconsole on the xdm
-greeter screen.
+can be edited to disable or modify the running of xconsole on the xdm
+greeter screen; see the
+.B xdm
+manual page for more information.
.SH AUTHOR
This manpage was written by Branden Robinson for the Debian Project.
.SH SEE ALSO
Property changes on: trunk/debian/local/xdm.options.5
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/debian/xdm.README.Debian
===================================================================
--- trunk/debian/xdm.README.Debian 2003-09-18 18:37:53 UTC (rev 553)
+++ trunk/debian/xdm.README.Debian 2003-09-18 21:37:09 UTC (rev 554)
@@ -44,16 +44,11 @@
version 3.3.4-1 of the xdm package, all remote XDMCP access is turned off
by default.
-Xsetup is a shell script which is run when xdm is asked to manage a server.
-
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.
-Branden Robinson, 23 August 2000
+$Id$
Property changes on: trunk/debian/xdm.README.Debian
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/debian/xdm.install
===================================================================
--- trunk/debian/xdm.install 2003-09-18 18:37:53 UTC (rev 553)
+++ trunk/debian/xdm.install 2003-09-18 21:37:09 UTC (rev 554)
@@ -1,10 +1,8 @@
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
-etc/X11/xdm/Xsetup
etc/X11/xdm/Xstartup
etc/X11/xdm/Xwilling
etc/X11/xdm/pixmaps/XFree86.xpm
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
