X Strike Force X.Org X11 SVN commit: r419 - in branches/6.9/debian: . local patches/general po scripts
Author: dnusinow
Date: 2005-07-26 22:02:54 -0500 (Tue, 26 Jul 2005)
New Revision: 419
Added:
branches/6.9/debian/patches/general/022_disable_xmh.diff
Modified:
branches/6.9/debian/local/Xsession
branches/6.9/debian/local/Xsession.5
branches/6.9/debian/po/pothead.in
branches/6.9/debian/scripts/manifest-install-reconcile
branches/6.9/debian/scripts/mir-false-negatives
branches/6.9/debian/twm.README.Debian
branches/6.9/debian/xbase-clients.README.Debian
branches/6.9/debian/xdm.README.Debian
branches/6.9/debian/xfonts-scalable.postinst.in
branches/6.9/debian/xfs.README.Debian
branches/6.9/debian/xserver-common.README.Debian
branches/6.9/debian/xserver-xorg.postrm.in
branches/6.9/debian/xserver-xorg.preinst.in
branches/6.9/debian/xserver-xorg.prerm.in
branches/6.9/debian/xterm.README.Debian
branches/6.9/debian/xutils.README.Debian
Log:
Merge changes from trunk HEAD (r418) to 6.9 branch
Modified: branches/6.9/debian/local/Xsession
===================================================================
--- branches/6.9/debian/local/Xsession 2005-07-27 02:01:47 UTC (rev 418)
+++ branches/6.9/debian/local/Xsession 2005-07-27 03:02:54 UTC (rev 419)
@@ -4,7 +4,7 @@
#
# global Xsession file -- used by display managers and xinit (startx)
-# $Id: Xsession 1507M 2004-09-13 07:36:26Z (local) $
+# $Id$
set -e
Modified: branches/6.9/debian/local/Xsession.5
===================================================================
--- branches/6.9/debian/local/Xsession.5 2005-07-27 02:01:47 UTC (rev 418)
+++ branches/6.9/debian/local/Xsession.5 2005-07-27 03:02:54 UTC (rev 419)
@@ -1,4 +1,4 @@
-.\" $Id: Xsession.5 2138 2005-01-17 23:40:27Z branden $
+.\" $Id$
.\"
.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
.\"
Added: branches/6.9/debian/patches/general/022_disable_xmh.diff
===================================================================
--- branches/6.9/debian/patches/general/022_disable_xmh.diff 2005-07-27 02:01:47 UTC (rev 418)
+++ branches/6.9/debian/patches/general/022_disable_xmh.diff 2005-07-27 03:02:54 UTC (rev 419)
@@ -0,0 +1,13 @@
+Index: trunk/xc/programs/Imakefile
+===================================================================
+--- trunk.orig/xc/programs/Imakefile 2005-05-08 23:29:21.000000000 -0400
++++ trunk/xc/programs/Imakefile 2005-07-26 01:10:55.000000000 -0400
+@@ -139,7 +139,7 @@
+ $(XF86DGASRCDIR) xedit xev xeyes xfd xfontsel $(XFSSRCDIR) xfsinfo \
+ $(XFINDPROXYSRCDIR) $(XFWPSRCDIR) $(XGAMMASRCDIR) xgc $(XHOSTSRCDIR) \
+ $(XINITSRCDIR) $(XKBSRCDIRS) xkill $(XLOADDIR) xlogo xlsatoms \
+- xlsclients xlsfonts xmag xman xmessage xmh xmodmap $(XMORE) xprop \
++ xlsclients xlsfonts xmag xman xmessage xmodmap $(XMORE) xprop \
+ xrdb xrefresh $(XRXSRCDIR) xset \
+ xsetroot $(XSMSRCDIR) xstdcmap $(XINPUTCLIENTDIRS) \
+ $(XTERMSRCDIR) $(XTRAPCLIENTDIRS) $(XVIDTUNESRCDIR) xwd xwininfo xwud \
Modified: branches/6.9/debian/po/pothead.in
===================================================================
--- branches/6.9/debian/po/pothead.in 2005-07-27 02:01:47 UTC (rev 418)
+++ branches/6.9/debian/po/pothead.in 2005-07-27 03:02:54 UTC (rev 419)
@@ -1,6 +1,6 @@
# debconf templates for xfree86 package
#
-# $Id: pothead.in 1695 2004-07-29 07:22:25Z branden $
+# $Id$
#
# Copyright:
# Branden Robinson, 2000--2004
Modified: branches/6.9/debian/scripts/manifest-install-reconcile
===================================================================
--- branches/6.9/debian/scripts/manifest-install-reconcile 2005-07-27 02:01:47 UTC (rev 418)
+++ branches/6.9/debian/scripts/manifest-install-reconcile 2005-07-27 03:02:54 UTC (rev 419)
@@ -1,6 +1,6 @@
#!/bin/sh
-# $Id: manifest-install-reconcile 1682 2004-07-21 21:01:00Z branden $
+# $Id$
PROGNAME="${0##*/}"
Modified: branches/6.9/debian/scripts/mir-false-negatives
===================================================================
--- branches/6.9/debian/scripts/mir-false-negatives 2005-07-27 02:01:47 UTC (rev 418)
+++ branches/6.9/debian/scripts/mir-false-negatives 2005-07-27 03:02:54 UTC (rev 419)
@@ -1,4 +1,4 @@
-# $Id: mir-false-negatives 1706 2004-07-29 19:16:40Z branden $
+# $Id$
# This file is used by manifest-install-reconcile.
Modified: branches/6.9/debian/twm.README.Debian
===================================================================
--- branches/6.9/debian/twm.README.Debian 2005-07-27 02:01:47 UTC (rev 418)
+++ branches/6.9/debian/twm.README.Debian 2005-07-27 03:02:54 UTC (rev 419)
@@ -17,6 +17,6 @@
Some examples of .twmrc files from days of yore are available in
/usr/share/doc/twm/examples.
-$Id: twm.README.Debian 1244 2004-04-13 22:02:31Z branden $
+$Id$
vim:set ai et sts=4 sw=4 tw=80:
Modified: branches/6.9/debian/xbase-clients.README.Debian
===================================================================
--- branches/6.9/debian/xbase-clients.README.Debian 2005-07-27 02:01:47 UTC (rev 418)
+++ branches/6.9/debian/xbase-clients.README.Debian 2005-07-27 03:02:54 UTC (rev 419)
@@ -11,6 +11,6 @@
loaded for any of the X clients provided by xbase-clients. See the X(1)
manual page for information on X resource management.
-$Id: xbase-clients.README.Debian 1244 2004-04-13 22:02:31Z branden $
+$Id$
vim:set ai et sts=4 sw=4 tw=80:
Modified: branches/6.9/debian/xdm.README.Debian
===================================================================
--- branches/6.9/debian/xdm.README.Debian 2005-07-27 02:01:47 UTC (rev 418)
+++ branches/6.9/debian/xdm.README.Debian 2005-07-27 03:02:54 UTC (rev 419)
@@ -56,6 +56,6 @@
Debian GNU/Linux system. See the xdm.options(5) manual page for more
information.
-$Id: xdm.README.Debian 1966 2004-10-18 18:03:43Z branden $
+$Id$
vim:set ai et sts=4 sw=4 tw=80:
Modified: branches/6.9/debian/xfonts-scalable.postinst.in
===================================================================
--- branches/6.9/debian/xfonts-scalable.postinst.in 2005-07-27 02:01:47 UTC (rev 418)
+++ branches/6.9/debian/xfonts-scalable.postinst.in 2005-07-27 03:02:54 UTC (rev 419)
@@ -5,7 +5,7 @@
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-# $Id: xfonts-scalable.postinst.in 1183 2004-03-25 22:25:41Z branden $
+# $Id$
set -e
Modified: branches/6.9/debian/xfs.README.Debian
===================================================================
--- branches/6.9/debian/xfs.README.Debian 2005-07-27 02:01:47 UTC (rev 418)
+++ branches/6.9/debian/xfs.README.Debian 2005-07-27 03:02:54 UTC (rev 419)
@@ -35,6 +35,6 @@
For information on the /etc/X11/fs/config file, see the xfs(1)
manual page.
-$Id: xfs.README.Debian 1244 2004-04-13 22:02:31Z branden $
+$Id$
vim:set ai et sts=4 sw=4 tw=80:
Modified: branches/6.9/debian/xserver-common.README.Debian
===================================================================
--- branches/6.9/debian/xserver-common.README.Debian 2005-07-27 02:01:47 UTC (rev 418)
+++ branches/6.9/debian/xserver-common.README.Debian 2005-07-27 03:02:54 UTC (rev 419)
@@ -11,6 +11,6 @@
Modelines for the XF86Config file, is included in the doc-linux-text (plain
ASCII format) and doc-linux-html (HTML format) packages.
-$Id: xserver-common.README.Debian 1244 2004-04-13 22:02:31Z branden $
+$Id$
vim:set ai et sts=4 sw=4 tw=80:
Modified: branches/6.9/debian/xserver-xorg.postrm.in
===================================================================
--- branches/6.9/debian/xserver-xorg.postrm.in 2005-07-27 02:01:47 UTC (rev 418)
+++ branches/6.9/debian/xserver-xorg.postrm.in 2005-07-27 03:02:54 UTC (rev 419)
@@ -5,7 +5,7 @@
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-# $Id: xserver-xfree86.postrm.in 1044 2004-02-16 17:40:33Z branden $
+# $Id$
set -e
Modified: branches/6.9/debian/xserver-xorg.preinst.in
===================================================================
--- branches/6.9/debian/xserver-xorg.preinst.in 2005-07-27 02:01:47 UTC (rev 418)
+++ branches/6.9/debian/xserver-xorg.preinst.in 2005-07-27 03:02:54 UTC (rev 419)
@@ -4,7 +4,7 @@
# 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>.
-# $Id: xserver-xfree86.preinst.in 1044 2004-02-16 17:40:33Z branden $
+# $Id$
set -e
Modified: branches/6.9/debian/xserver-xorg.prerm.in
===================================================================
--- branches/6.9/debian/xserver-xorg.prerm.in 2005-07-27 02:01:47 UTC (rev 418)
+++ branches/6.9/debian/xserver-xorg.prerm.in 2005-07-27 03:02:54 UTC (rev 419)
@@ -5,7 +5,7 @@
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-# $Id: xserver-xfree86.prerm.in 1044 2004-02-16 17:40:33Z branden $
+# $Id$
set -e
Modified: branches/6.9/debian/xterm.README.Debian
===================================================================
--- branches/6.9/debian/xterm.README.Debian 2005-07-27 02:01:47 UTC (rev 418)
+++ branches/6.9/debian/xterm.README.Debian 2005-07-27 03:02:54 UTC (rev 419)
@@ -45,6 +45,6 @@
consistent with the Linux virtual console (and therefore with the behavior
of DEC VT 220 terminals).
-$Id: xterm.README.Debian 1244 2004-04-13 22:02:31Z branden $
+$Id$
vim:set ai et sts=4 sw=4 tw=80:
Modified: branches/6.9/debian/xutils.README.Debian
===================================================================
--- branches/6.9/debian/xutils.README.Debian 2005-07-27 02:01:47 UTC (rev 418)
+++ branches/6.9/debian/xutils.README.Debian 2005-07-27 03:02:54 UTC (rev 419)
@@ -19,6 +19,6 @@
"A Flexible Remote Execution Protocol based on rsh", is included in the
xspecs package.
-$Id: xutils.README.Debian 1244 2004-04-13 22:02:31Z branden $
+$Id$
vim:set ai et sts=4 sw=4 tw=80:
Reply to: