Author: branden
Date: 2004-01-14 12:57:53 -0500 (Wed, 14 Jan 2004)
New Revision: 910
Added:
branches/4.3.0/sid/debian/patches/912_debian_rstart.real_location.diff
Modified:
branches/4.3.0/sid/debian/MANIFEST.alpha
branches/4.3.0/sid/debian/MANIFEST.arm
branches/4.3.0/sid/debian/MANIFEST.hppa
branches/4.3.0/sid/debian/MANIFEST.hurd-i386
branches/4.3.0/sid/debian/MANIFEST.i386
branches/4.3.0/sid/debian/MANIFEST.ia64
branches/4.3.0/sid/debian/MANIFEST.m68k
branches/4.3.0/sid/debian/MANIFEST.mips
branches/4.3.0/sid/debian/MANIFEST.mipsel
branches/4.3.0/sid/debian/MANIFEST.powerpc
branches/4.3.0/sid/debian/MANIFEST.s390
branches/4.3.0/sid/debian/MANIFEST.sparc
branches/4.3.0/sid/debian/NEWS
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
branches/4.3.0/sid/debian/xutils.install
branches/4.3.0/sid/debian/xutils.install.s390
branches/4.3.0/sid/debian/xutils.postinst.in
branches/4.3.0/sid/debian/xutils.postrm.in
branches/4.3.0/sid/debian/xutils.preinst.in
Log:
Move rstard.real executable from /etc/X11/rstart to /usr/X11R6/bin.
(Closes: #143825)
debian/patches/000_stolen_from_HEAD.diff:
(xc/programs/rstart/Imakefile):
+ [Fix] Missing depend target [Marc Aurele La France]
+ Allow rstartd.real to be installed into a location other than LIBDIR
(#6034, Luke Mewburn).
debian/patches/912_debian_rstart.real_location.diff:
(xc/programs/rstart/Imakefile): use BINDIR instead of MYLIBDIR when
dealing with RSERVERNAME
debian/MANIFEST.*: note new location
debian/NEWS: a conffile is being removed on upgrade, so inform users of
this fact in the unlikely event they customized this ELF executable
debian/xutils.install*: ship file from its new location
debian/xutils.{postinst,preinst,prerm}.in: prepare, roll back, and commit
removal of conffile as needed
Modified: branches/4.3.0/sid/debian/MANIFEST.alpha
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.alpha 2004-01-13 22:49:11 UTC (rev
909)
+++ branches/4.3.0/sid/debian/MANIFEST.alpha 2004-01-14 17:57:53 UTC (rev
910)
@@ -60,7 +60,6 @@
etc/X11/rstart/contexts/@List
etc/X11/rstart/contexts/default
etc/X11/rstart/contexts/x11r6
-etc/X11/rstart/rstartd.real
etc/X11/twm/system.twmrc
etc/X11/twm/system.twmrc-menu
etc/X11/xdm/GiveConsole
@@ -475,6 +474,7 @@
usr/X11R6/bin/revpath
usr/X11R6/bin/rstart
usr/X11R6/bin/rstartd
+usr/X11R6/bin/rstartd.real
usr/X11R6/bin/scanpci
usr/X11R6/bin/sessreg
usr/X11R6/bin/setxkbmap
Modified: branches/4.3.0/sid/debian/MANIFEST.arm
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.arm 2004-01-13 22:49:11 UTC (rev
909)
+++ branches/4.3.0/sid/debian/MANIFEST.arm 2004-01-14 17:57:53 UTC (rev
910)
@@ -60,7 +60,6 @@
etc/X11/rstart/contexts/@List
etc/X11/rstart/contexts/default
etc/X11/rstart/contexts/x11r6
-etc/X11/rstart/rstartd.real
etc/X11/twm/system.twmrc
etc/X11/twm/system.twmrc-menu
etc/X11/xdm/GiveConsole
@@ -474,6 +473,7 @@
usr/X11R6/bin/revpath
usr/X11R6/bin/rstart
usr/X11R6/bin/rstartd
+usr/X11R6/bin/rstartd.real
usr/X11R6/bin/scanpci
usr/X11R6/bin/sessreg
usr/X11R6/bin/setxkbmap
Modified: branches/4.3.0/sid/debian/MANIFEST.hppa
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.hppa 2004-01-13 22:49:11 UTC (rev
909)
+++ branches/4.3.0/sid/debian/MANIFEST.hppa 2004-01-14 17:57:53 UTC (rev
910)
@@ -60,7 +60,6 @@
etc/X11/rstart/contexts/@List
etc/X11/rstart/contexts/default
etc/X11/rstart/contexts/x11r6
-etc/X11/rstart/rstartd.real
etc/X11/twm/system.twmrc
etc/X11/twm/system.twmrc-menu
etc/X11/xdm/GiveConsole
@@ -474,6 +473,7 @@
usr/X11R6/bin/revpath
usr/X11R6/bin/rstart
usr/X11R6/bin/rstartd
+usr/X11R6/bin/rstartd.real
usr/X11R6/bin/scanpci
usr/X11R6/bin/sessreg
usr/X11R6/bin/setxkbmap
Modified: branches/4.3.0/sid/debian/MANIFEST.hurd-i386
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.hurd-i386 2004-01-13 22:49:11 UTC
(rev 909)
+++ branches/4.3.0/sid/debian/MANIFEST.hurd-i386 2004-01-14 17:57:53 UTC
(rev 910)
@@ -60,7 +60,6 @@
etc/X11/rstart/contexts/@List
etc/X11/rstart/contexts/default
etc/X11/rstart/contexts/x11r6
-etc/X11/rstart/rstartd.real
etc/X11/twm/system.twmrc
etc/X11/twm/system.twmrc-menu
etc/X11/xdm/GiveConsole
@@ -475,6 +474,7 @@
usr/X11R6/bin/revpath
usr/X11R6/bin/rstart
usr/X11R6/bin/rstartd
+usr/X11R6/bin/rstartd.real
usr/X11R6/bin/scanpci
usr/X11R6/bin/sessreg
usr/X11R6/bin/setxkbmap
Modified: branches/4.3.0/sid/debian/MANIFEST.i386
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.i386 2004-01-13 22:49:11 UTC (rev
909)
+++ branches/4.3.0/sid/debian/MANIFEST.i386 2004-01-14 17:57:53 UTC (rev
910)
@@ -60,7 +60,6 @@
etc/X11/rstart/contexts/@List
etc/X11/rstart/contexts/default
etc/X11/rstart/contexts/x11r6
-etc/X11/rstart/rstartd.real
etc/X11/twm/system.twmrc
etc/X11/twm/system.twmrc-menu
etc/X11/xdm/GiveConsole
@@ -475,6 +474,7 @@
usr/X11R6/bin/revpath
usr/X11R6/bin/rstart
usr/X11R6/bin/rstartd
+usr/X11R6/bin/rstartd.real
usr/X11R6/bin/scanpci
usr/X11R6/bin/sessreg
usr/X11R6/bin/setxkbmap
Modified: branches/4.3.0/sid/debian/MANIFEST.ia64
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.ia64 2004-01-13 22:49:11 UTC (rev
909)
+++ branches/4.3.0/sid/debian/MANIFEST.ia64 2004-01-14 17:57:53 UTC (rev
910)
@@ -60,7 +60,6 @@
etc/X11/rstart/contexts/@List
etc/X11/rstart/contexts/default
etc/X11/rstart/contexts/x11r6
-etc/X11/rstart/rstartd.real
etc/X11/twm/system.twmrc
etc/X11/twm/system.twmrc-menu
etc/X11/xdm/GiveConsole
@@ -475,6 +474,7 @@
usr/X11R6/bin/revpath
usr/X11R6/bin/rstart
usr/X11R6/bin/rstartd
+usr/X11R6/bin/rstartd.real
usr/X11R6/bin/scanpci
usr/X11R6/bin/sessreg
usr/X11R6/bin/setxkbmap
Modified: branches/4.3.0/sid/debian/MANIFEST.m68k
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.m68k 2004-01-13 22:49:11 UTC (rev
909)
+++ branches/4.3.0/sid/debian/MANIFEST.m68k 2004-01-14 17:57:53 UTC (rev
910)
@@ -60,7 +60,6 @@
etc/X11/rstart/contexts/@List
etc/X11/rstart/contexts/default
etc/X11/rstart/contexts/x11r6
-etc/X11/rstart/rstartd.real
etc/X11/twm/system.twmrc
etc/X11/twm/system.twmrc-menu
etc/X11/xdm/GiveConsole
@@ -474,6 +473,7 @@
usr/X11R6/bin/revpath
usr/X11R6/bin/rstart
usr/X11R6/bin/rstartd
+usr/X11R6/bin/rstartd.real
usr/X11R6/bin/scanpci
usr/X11R6/bin/sessreg
usr/X11R6/bin/setxkbmap
Modified: branches/4.3.0/sid/debian/MANIFEST.mips
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.mips 2004-01-13 22:49:11 UTC (rev
909)
+++ branches/4.3.0/sid/debian/MANIFEST.mips 2004-01-14 17:57:53 UTC (rev
910)
@@ -60,7 +60,6 @@
etc/X11/rstart/contexts/@List
etc/X11/rstart/contexts/default
etc/X11/rstart/contexts/x11r6
-etc/X11/rstart/rstartd.real
etc/X11/twm/system.twmrc
etc/X11/twm/system.twmrc-menu
etc/X11/xdm/GiveConsole
@@ -474,6 +473,7 @@
usr/X11R6/bin/revpath
usr/X11R6/bin/rstart
usr/X11R6/bin/rstartd
+usr/X11R6/bin/rstartd.real
usr/X11R6/bin/scanpci
usr/X11R6/bin/sessreg
usr/X11R6/bin/setxkbmap
Modified: branches/4.3.0/sid/debian/MANIFEST.mipsel
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.mipsel 2004-01-13 22:49:11 UTC (rev
909)
+++ branches/4.3.0/sid/debian/MANIFEST.mipsel 2004-01-14 17:57:53 UTC (rev
910)
@@ -60,7 +60,6 @@
etc/X11/rstart/contexts/@List
etc/X11/rstart/contexts/default
etc/X11/rstart/contexts/x11r6
-etc/X11/rstart/rstartd.real
etc/X11/twm/system.twmrc
etc/X11/twm/system.twmrc-menu
etc/X11/xdm/GiveConsole
@@ -474,6 +473,7 @@
usr/X11R6/bin/revpath
usr/X11R6/bin/rstart
usr/X11R6/bin/rstartd
+usr/X11R6/bin/rstartd.real
usr/X11R6/bin/scanpci
usr/X11R6/bin/sessreg
usr/X11R6/bin/setxkbmap
Modified: branches/4.3.0/sid/debian/MANIFEST.powerpc
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.powerpc 2004-01-13 22:49:11 UTC (rev
909)
+++ branches/4.3.0/sid/debian/MANIFEST.powerpc 2004-01-14 17:57:53 UTC (rev
910)
@@ -60,7 +60,6 @@
etc/X11/rstart/contexts/@List
etc/X11/rstart/contexts/default
etc/X11/rstart/contexts/x11r6
-etc/X11/rstart/rstartd.real
etc/X11/twm/system.twmrc
etc/X11/twm/system.twmrc-menu
etc/X11/xdm/GiveConsole
@@ -474,6 +473,7 @@
usr/X11R6/bin/revpath
usr/X11R6/bin/rstart
usr/X11R6/bin/rstartd
+usr/X11R6/bin/rstartd.real
usr/X11R6/bin/scanpci
usr/X11R6/bin/sessreg
usr/X11R6/bin/setxkbmap
Modified: branches/4.3.0/sid/debian/MANIFEST.s390
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.s390 2004-01-13 22:49:11 UTC (rev
909)
+++ branches/4.3.0/sid/debian/MANIFEST.s390 2004-01-14 17:57:53 UTC (rev
910)
@@ -55,7 +55,6 @@
etc/X11/rstart/contexts/@List
etc/X11/rstart/contexts/default
etc/X11/rstart/contexts/x11r6
-etc/X11/rstart/rstartd.real
etc/X11/twm/system.twmrc
etc/X11/twm/system.twmrc-menu
etc/X11/xdm/GiveConsole
@@ -463,6 +462,7 @@
usr/X11R6/bin/revpath
usr/X11R6/bin/rstart
usr/X11R6/bin/rstartd
+usr/X11R6/bin/rstartd.real
usr/X11R6/bin/sessreg
usr/X11R6/bin/setxkbmap
usr/X11R6/bin/showfont
Modified: branches/4.3.0/sid/debian/MANIFEST.sparc
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.sparc 2004-01-13 22:49:11 UTC (rev
909)
+++ branches/4.3.0/sid/debian/MANIFEST.sparc 2004-01-14 17:57:53 UTC (rev
910)
@@ -60,7 +60,6 @@
etc/X11/rstart/contexts/@List
etc/X11/rstart/contexts/default
etc/X11/rstart/contexts/x11r6
-etc/X11/rstart/rstartd.real
etc/X11/twm/system.twmrc
etc/X11/twm/system.twmrc-menu
etc/X11/xdm/GiveConsole
@@ -474,6 +473,7 @@
usr/X11R6/bin/revpath
usr/X11R6/bin/rstart
usr/X11R6/bin/rstartd
+usr/X11R6/bin/rstartd.real
usr/X11R6/bin/scanpci
usr/X11R6/bin/sessreg
usr/X11R6/bin/setxkbmap
Modified: branches/4.3.0/sid/debian/NEWS
===================================================================
--- branches/4.3.0/sid/debian/NEWS 2004-01-13 22:49:11 UTC (rev 909)
+++ branches/4.3.0/sid/debian/NEWS 2004-01-14 17:57:53 UTC (rev 910)
@@ -1,3 +1,19 @@
+xfree86 (4.3.0-0pre1v6) unstable; urgency=low
+
+ * The rstartd.real file, previously in /etc/X11/rstart, has been moved to
+ /usr/X11R6/bin. Because rstartd.real was previously what is known to the
+ Debian package manager as a "conffile", it is possible that you have
+ customized this file, with changed preserved by dpkg. This upgrade,
+ however, will remove /etc/X11/rstart/rstartd.real regardless of whether or
+ not you have changed it.
+
+ In the unlikely event you have customized rstartd.real (which, as shipped,
+ is a binary executable file), you will need to back it up before upgrading
+ to the this version of the xutils package. If you do not so, your changes
+ to rstartd.real will be lost.
+
+ -- Branden Robinson <[EMAIL PROTECTED]> Tue, 13 Jan 2004 20:46:02 -0500
+
xfree86 (4.2.1-11) unstable; urgency=medium
* The following configuration files use a new, MD5-checksum-based method of
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2004-01-13 22:49:11 UTC (rev 909)
+++ branches/4.3.0/sid/debian/changelog 2004-01-14 17:57:53 UTC (rev 910)
@@ -51,8 +51,25 @@
Eduard!). (Closes: #227217)
- debian/local/FAQ
- -- Branden Robinson <[EMAIL PROTECTED]> Tue, 13 Jan 2004 17:46:21 -0500
+ * Move rstard.real executable from /etc/X11/rstart to /usr/X11R6/bin.
+ (Closes: #143825)
+ - debian/patches/000_stolen_from_HEAD.diff:
+ (xc/programs/rstart/Imakefile):
+ + [Fix] Missing depend target [Marc Aurele La France]
+ + Allow rstartd.real to be installed into a location other than LIBDIR
+ (#6034, Luke Mewburn).
+ - debian/patches/912_debian_rstart.real_location.diff:
+ (xc/programs/rstart/Imakefile): use BINDIR instead of MYLIBDIR when
+ dealing with RSERVERNAME
+ - debian/MANIFEST.*: note new location
+ - debian/NEWS: a conffile is being removed on upgrade, so inform users of
+ this fact in the unlikely event they customized this ELF executable
+ - debian/xutils.install*: ship file from its new location
+ - debian/xutils.{postinst,preinst,prerm}.in: prepare, roll back, and
+ commit removal of conffile as needed
+ -- Branden Robinson <[EMAIL PROTECTED]> Wed, 14 Jan 2004 12:48:35 -0500
+
xfree86 (4.3.0-0pre1v5) experimental; urgency=low
* Grab fixes to upstream CVS xf-4_3-branch since last pull.
Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2004-01-13
22:49:11 UTC (rev 909)
+++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2004-01-14
17:57:53 UTC (rev 910)
@@ -28,6 +28,14 @@
xc/nls/locale.alias @ 1.65
Add ko_KR.EUC-KR (Jungshik Shin).
+xc/programs/rstart/Imakefile @ 3.12
+ [Fix] Missing depend target [Marc Aurele La France]
+
+xc/programs/rstart/Imakefile @ 3.13
+xc/programs/rstart/server.cpp @ 3.3
+ 748. Allow rstartd.real to be installed into a location other than LIBDIR
+ (#6034, Luke Mewburn).
+
diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
--- xc.orig/config/imake/imake.c 2002-12-17 09:48:27.000000000 +1100
+++ xc/config/imake/imake.c 2003-04-09 01:58:14.000000000 +1000
@@ -717,3 +725,55 @@
ko_KR.euc: ko_KR.eucKR
ko_KR.euckr: ko_KR.eucKR
ko_KR.utf8: ko_KR.UTF-8
+Index: xc/programs/rstart/Imakefile
+===================================================================
+RCS file: /cvs/xc/programs/rstart/Imakefile,v
+retrieving revision 3.11
+retrieving revision 3.13
+diff -u -u -r3.11 -r3.13
+--- xc/programs/rstart/Imakefile 31 May 2002 18:46:08 -0000 3.11
++++ xc/programs/rstart/Imakefile 9 Jan 2004 00:28:50 -0000 3.13
+@@ -3,7 +3,7 @@
+ XCOMM
+ XCOMM
+ XCOMM
+-XCOMM $XFree86: xc/programs/rstart/Imakefile,v 3.11 2002/05/31 18:46:08 dawes
Exp $
++XCOMM $XFree86: xc/programs/rstart/Imakefile,v 3.13 2004/01/09 00:28:50 dawes
Exp $
+ XCOMM
+ XCOMM Copyright (c) 1993 Quarterdeck Office Systems
+ XCOMM
+@@ -72,7 +72,7 @@
+ SpecialCObjectRule(server,NullParameter,$(SRVDEFS) $(PEDEFS))
+
+ AllTarget($(SSERVERNAME))
+-CppScriptTarget($(SSERVERNAME),$(SSERVERSRC),$(OS) -DLIBDIR=$(MYLIBDIR)
-DSERVERNAME=$(SERVERNAME),NullParameter)
++CppScriptTarget($(SSERVERNAME),$(SSERVERSRC),$(OS) -DLIBDIR=$(MYLIBDIR)
-DSERVERNAME=$(SERVERNAME) -DBINDIR=$(MYLIBDIR),NullParameter)
+ InstallNamedProg($(SSERVERNAME),$(SSERVERNAME),$(BINDIR))
+
+ AllTarget($(CLIENTNAME))
+@@ -82,6 +82,8 @@
+ AllTarget(config)
+ CppFileTarget(config,config.cpp,-DBINDIR=$(BINDIR) -DLIBDIR=$(MYLIBDIR)
-DPACKAGEname=$(PACKAGEname) -DENVPREFIX=$(ENVPREFIX),NullParameter)
+ InstallNonExecFile(config,$(MYLIBDIR))
++
++DependTarget()
+
+ #ifdef ProjectRoot
+ DEFAULT_X_MANPATH=$(MANPATH):SystemManDirectory
+Index: xc/programs/rstart/server.cpp
+===================================================================
+RCS file: /cvs/xc/programs/rstart/server.cpp,v
+retrieving revision 3.2
+retrieving revision 3.3
+diff -u -u -r3.2 -r3.3
+--- xc/programs/rstart/server.cpp 17 Jan 2001 23:45:03 -0000 3.2
++++ xc/programs/rstart/server.cpp 9 Jan 2004 00:28:50 -0000 3.3
+@@ -24,6 +24,6 @@
+ XCOMM OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT
+ XCOMM OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ XCOMM
+-XCOMM $XFree86: xc/programs/rstart/server.cpp,v 3.2 2001/01/17 23:45:03 dawes
Exp $
++XCOMM $XFree86: xc/programs/rstart/server.cpp,v 3.3 2004/01/09 00:28:50 dawes
Exp $
+
+-exec LIBDIR/SERVERNAME.real -c LIBDIR/config
++exec BINDIR/SERVERNAME.real -c LIBDIR/config
Added: branches/4.3.0/sid/debian/patches/912_debian_rstart.real_location.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/912_debian_rstart.real_location.diff
2004-01-13 22:49:11 UTC (rev 909)
+++ branches/4.3.0/sid/debian/patches/912_debian_rstart.real_location.diff
2004-01-14 17:57:53 UTC (rev 910)
@@ -0,0 +1,27 @@
+$Id$
+
+(Sloppily) resolve Debian #97671/#143825, the subjectively objective
+non-release-critical release-critical bug.
+
+A clean solution would teach imake about the FHS, and configure Debian to
+use FHS-compatible paths over the traditional ones. rstart specifically
+also needs to be taught to distinguish "RSERVERNAME" from other files that
+go in "MYLIBDIR".
+
+--- xc/programs/rstart/Imakefile.orig 2004-01-13 16:59:43.000000000 -0500
++++ xc/programs/rstart/Imakefile 2004-01-13 16:59:58.000000000 -0500
+@@ -67,12 +67,12 @@
+
+ AllTarget(ProgramTargetName($(RSERVERNAME)))
+ NormalProgramTarget($(RSERVERNAME),
$(OBJS),NullParameter,NullParameter,NullParameter)
+-InstallProgram($(RSERVERNAME),$(MYLIBDIR))
++InstallProgram($(RSERVERNAME),$(BINDIR))
+
+ SpecialCObjectRule(server,NullParameter,$(SRVDEFS) $(PEDEFS))
+
+ AllTarget($(SSERVERNAME))
+-CppScriptTarget($(SSERVERNAME),$(SSERVERSRC),$(OS) -DLIBDIR=$(MYLIBDIR)
-DSERVERNAME=$(SERVERNAME) -DBINDIR=$(MYLIBDIR),NullParameter)
++CppScriptTarget($(SSERVERNAME),$(SSERVERSRC),$(OS) -DLIBDIR=$(MYLIBDIR)
-DSERVERNAME=$(SERVERNAME) -DBINDIR=$(BINDIR),NullParameter)
+ InstallNamedProg($(SSERVERNAME),$(SSERVERNAME),$(BINDIR))
+
+ AllTarget($(CLIENTNAME))
Property changes on:
branches/4.3.0/sid/debian/patches/912_debian_rstart.real_location.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: branches/4.3.0/sid/debian/xutils.install
===================================================================
--- branches/4.3.0/sid/debian/xutils.install 2004-01-13 22:49:11 UTC (rev
909)
+++ branches/4.3.0/sid/debian/xutils.install 2004-01-14 17:57:53 UTC (rev
910)
@@ -8,7 +8,6 @@
etc/X11/rstart/contexts/@List
etc/X11/rstart/contexts/default
etc/X11/rstart/contexts/x11r6
-etc/X11/rstart/rstartd.real
usr/X11R6/bin/atobm
usr/X11R6/bin/bdftopcf
usr/X11R6/bin/bdftruncate
@@ -34,6 +33,7 @@
usr/X11R6/bin/revpath
usr/X11R6/bin/rstart
usr/X11R6/bin/rstartd
+usr/X11R6/bin/rstartd.real
usr/X11R6/bin/scanpci
usr/X11R6/bin/sessreg
usr/X11R6/bin/showfont
Modified: branches/4.3.0/sid/debian/xutils.install.s390
===================================================================
--- branches/4.3.0/sid/debian/xutils.install.s390 2004-01-13 22:49:11 UTC
(rev 909)
+++ branches/4.3.0/sid/debian/xutils.install.s390 2004-01-14 17:57:53 UTC
(rev 910)
@@ -8,7 +8,6 @@
etc/X11/rstart/contexts/@List
etc/X11/rstart/contexts/default
etc/X11/rstart/contexts/x11r6
-etc/X11/rstart/rstartd.real
usr/X11R6/bin/atobm
usr/X11R6/bin/bdftopcf
usr/X11R6/bin/bdftruncate
@@ -33,6 +32,7 @@
usr/X11R6/bin/revpath
usr/X11R6/bin/rstart
usr/X11R6/bin/rstartd
+usr/X11R6/bin/rstartd.real
usr/X11R6/bin/sessreg
usr/X11R6/bin/showfont
usr/X11R6/bin/showrgb
Modified: branches/4.3.0/sid/debian/xutils.postinst.in
===================================================================
--- branches/4.3.0/sid/debian/xutils.postinst.in 2004-01-13 22:49:11 UTC
(rev 909)
+++ branches/4.3.0/sid/debian/xutils.postinst.in 2004-01-14 17:57:53 UTC
(rev 910)
@@ -21,7 +21,12 @@
if [ -e /etc/X11/rstartd.moved-by-preinst ]; then
rm /etc/X11/rstartd.moved-by-preinst
fi
-
+if [ -e /etc/X11/rstart/rstartd.real.dpkg-tmp ]; then
+ # we do not use remove_conffile_commit(); see xutils preinst script
+ observe "committing removal of obsolete conffile" \
+ "/etc/X11/rstart/rstartd.real"
+ rm /etc/X11/rstart/rstartd.real.dpkg-tmp
+fi
#DEBHELPER#
exit 0
Modified: branches/4.3.0/sid/debian/xutils.postrm.in
===================================================================
--- branches/4.3.0/sid/debian/xutils.postrm.in 2004-01-13 22:49:11 UTC (rev
909)
+++ branches/4.3.0/sid/debian/xutils.postrm.in 2004-01-14 17:57:53 UTC (rev
910)
@@ -21,6 +21,11 @@
mv /etc/X11/rstart /etc/X11/rstartd
rm /etc/X11/rstart.moved-by-preinst
fi
+ if [ -e /etc/X11/rstart/rstartd.real.dpkg-tmp ]; then
+ # we do not use remove_conffile_rollback(); see xutils preinst script
+ observe "rolling back removal of obsolete conffile" \
+ "/etc/X11/rstart/rstartd.real"
+ mv /etc/X11/rstart/rstartd.real.dpkg-tmp /etc/X11/rstart/rstartd.real
fi
#DEBHELPER#
Modified: branches/4.3.0/sid/debian/xutils.preinst.in
===================================================================
--- branches/4.3.0/sid/debian/xutils.preinst.in 2004-01-13 22:49:11 UTC (rev
909)
+++ branches/4.3.0/sid/debian/xutils.preinst.in 2004-01-14 17:57:53 UTC (rev
910)
@@ -27,6 +27,17 @@
mv /usr/X11R6/lib/X11/rstart /usr/X11R6/lib/X11/rstart.moved-by-preinst
fi
+ # rstard.real moved out of /etc in 4.3.0-1; we do not use
+ # remove_conffile_prepare() because it was an ELF object and list of
+ # canonical MD5 sums would be horrendously long. Furthermore, if the FHS
+ # priests are correct, no one will taken this file's claims of
+ # configurability seriously.
+ if dpkg --compare-versions "$2" lt "4.3.0-1"; then
+ observe "preparing to remove obsolete conffile" \
+ "/etc/X11/rstart/rstartd.real"
+ mv /etc/X11/rstart/rstartd.real /etc/X11/rstart/rstartd.real.dpkg-tmp
+ fi
+
check_symlinks_and_warn /usr/X11R6/lib/X11/rstart /usr/bin/rstartd
fi
