X Strike Force XOrg SVN commit: r33 - in xorg-config/trunk/debian: . patches
Author: fabbione
Date: 2004-10-07 06:25:12 -0500 (Thu, 07 Oct 2004)
New Revision: 33
Added:
xorg-config/trunk/debian/patches/901_kill_X11R6
Modified:
xorg-config/trunk/debian/CHANGESETS
xorg-config/trunk/debian/xutils-configs.install
xorg-config/trunk/debian/xutils-devel.install
Log:
Start killing X11R6.
Modified: xorg-config/trunk/debian/CHANGESETS
===================================================================
--- xorg-config/trunk/debian/CHANGESETS 2004-10-06 04:52:21 UTC (rev 32)
+++ xorg-config/trunk/debian/CHANGESETS 2004-10-07 11:25:12 UTC (rev 33)
@@ -12,7 +12,10 @@
29
* Add CHANGESETS and TODO files.
- Set $Id$ and vim modelines.
+ Set Id and vim modelines.
32
+* Start killing X11R6
+ 33
+
vim:set ai et sts=4 sw=4 tw=80:
Added: xorg-config/trunk/debian/patches/901_kill_X11R6
===================================================================
--- xorg-config/trunk/debian/patches/901_kill_X11R6 2004-10-06 04:52:21 UTC (rev 32)
+++ xorg-config/trunk/debian/patches/901_kill_X11R6 2004-10-07 11:25:12 UTC (rev 33)
@@ -0,0 +1,12 @@
+diff -ruN xc-old/config/cf/site.def xc/config/cf/site.def
+--- xc-old/config/cf/site.def 2004-05-06 17:08:25.000000000 +0200
++++ xc/config/cf/site.def 2004-10-07 13:20:54.854881712 +0200
+@@ -72,7 +72,7 @@
+ #ifdef AfterVendorCF
+
+ #ifndef ProjectRoot
+-#define ProjectRoot /usr/X11R6
++#define ProjectRoot /usr
+ #endif
+
+ /*
Modified: xorg-config/trunk/debian/xutils-configs.install
===================================================================
--- xorg-config/trunk/debian/xutils-configs.install 2004-10-06 04:52:21 UTC (rev 32)
+++ xorg-config/trunk/debian/xutils-configs.install 2004-10-07 11:25:12 UTC (rev 33)
@@ -1,108 +1,108 @@
-usr/X11R6/lib/X11/config/Imake.rules
-usr/X11R6/lib/X11/config/Motif.rules
-usr/X11R6/lib/X11/config/Win32.rules
-usr/X11R6/lib/X11/config/X11.rules
-usr/X11R6/lib/X11/config/bsdLib.rules
-usr/X11R6/lib/X11/config/cde.rules
-usr/X11R6/lib/X11/config/cygwin.rules
-usr/X11R6/lib/X11/config/darwinLib.rules
-usr/X11R6/lib/X11/config/gnuLib.rules
-usr/X11R6/lib/X11/config/hpLib.rules
-usr/X11R6/lib/X11/config/ibmLib.rules
-usr/X11R6/lib/X11/config/lnxLib.rules
-usr/X11R6/lib/X11/config/lnxdoc.rules
-usr/X11R6/lib/X11/config/necLib.rules
-usr/X11R6/lib/X11/config/noop.rules
-usr/X11R6/lib/X11/config/nto.rules
-usr/X11R6/lib/X11/config/oldlib.rules
-usr/X11R6/lib/X11/config/os2.rules
-usr/X11R6/lib/X11/config/os2Lib.rules
-usr/X11R6/lib/X11/config/osfLib.rules
-usr/X11R6/lib/X11/config/scoLib.rules
-usr/X11R6/lib/X11/config/sgiLib.rules
-usr/X11R6/lib/X11/config/sunLib.rules
-usr/X11R6/lib/X11/config/sv3Lib.rules
-usr/X11R6/lib/X11/config/sv4Lib.rules
-usr/X11R6/lib/X11/config/QNX4.rules
-usr/X11R6/lib/X11/config/xf86.rules
-usr/X11R6/lib/X11/config/Imake.tmpl
-usr/X11R6/lib/X11/config/Library.tmpl
-usr/X11R6/lib/X11/config/Motif.tmpl
-usr/X11R6/lib/X11/config/Server.tmpl
-usr/X11R6/lib/X11/config/ServerLib.tmpl
-usr/X11R6/lib/X11/config/Threads.tmpl
-usr/X11R6/lib/X11/config/WinLib.tmpl
-usr/X11R6/lib/X11/config/X11.tmpl
-usr/X11R6/lib/X11/config/bsdLib.tmpl
-usr/X11R6/lib/X11/config/cde.tmpl
-usr/X11R6/lib/X11/config/cygwin.tmpl
-usr/X11R6/lib/X11/config/darwinLib.tmpl
-usr/X11R6/lib/X11/config/hpLib.tmpl
-usr/X11R6/lib/X11/config/gnuLib.tmpl
-usr/X11R6/lib/X11/config/ibmLib.tmpl
-usr/X11R6/lib/X11/config/lnxLib.tmpl
-usr/X11R6/lib/X11/config/lnxdoc.tmpl
-usr/X11R6/lib/X11/config/necLib.tmpl
-usr/X11R6/lib/X11/config/os2Lib.tmpl
-usr/X11R6/lib/X11/config/osfLib.tmpl
-usr/X11R6/lib/X11/config/sgiLib.tmpl
-usr/X11R6/lib/X11/config/sunLib.tmpl
-usr/X11R6/lib/X11/config/sv3Lib.tmpl
-usr/X11R6/lib/X11/config/sv4Lib.tmpl
-usr/X11R6/lib/X11/config/xf86.tmpl
-usr/X11R6/lib/X11/config/xorg.tmpl
-usr/X11R6/lib/X11/config/xf86site.def
-usr/X11R6/lib/X11/config/xorgsite.def
-usr/X11R6/lib/X11/config/date.def
-usr/X11R6/lib/X11/config/version.def
-usr/X11R6/lib/X11/config/host.def
-usr/X11R6/lib/X11/config/site.def
-usr/X11R6/lib/X11/config/Imake.cf
-usr/X11R6/lib/X11/config/Amoeba.cf
-usr/X11R6/lib/X11/config/DGUX.cf
-usr/X11R6/lib/X11/config/FreeBSD.cf
-usr/X11R6/lib/X11/config/Mips.cf
-usr/X11R6/lib/X11/config/NetBSD.cf
-usr/X11R6/lib/X11/config/OpenBSD.cf
-usr/X11R6/lib/X11/config/Oki.cf
-usr/X11R6/lib/X11/config/cygwin.cf
-usr/X11R6/lib/X11/config/Win32.cf
-usr/X11R6/lib/X11/config/apollo.cf
-usr/X11R6/lib/X11/config/bsd.cf
-usr/X11R6/lib/X11/config/bsdi.cf
-usr/X11R6/lib/X11/config/convex.cf
-usr/X11R6/lib/X11/config/cray.cf
-usr/X11R6/lib/X11/config/fujitsu.cf
-usr/X11R6/lib/X11/config/generic.cf
-usr/X11R6/lib/X11/config/gnu.cf
-usr/X11R6/lib/X11/config/hp.cf
-usr/X11R6/lib/X11/config/ibm.cf
-usr/X11R6/lib/X11/config/isc.cf
-usr/X11R6/lib/X11/config/linux.cf
-usr/X11R6/lib/X11/config/luna.cf
-usr/X11R6/lib/X11/config/macII.cf
-usr/X11R6/lib/X11/config/mach.cf
-usr/X11R6/lib/X11/config/minix.cf
-usr/X11R6/lib/X11/config/moto.cf
-usr/X11R6/lib/X11/config/ncr.cf
-usr/X11R6/lib/X11/config/nec.cf
-usr/X11R6/lib/X11/config/nto.cf
-usr/X11R6/lib/X11/config/os2.cf
-usr/X11R6/lib/X11/config/osf1.cf
-usr/X11R6/lib/X11/config/pegasus.cf
-usr/X11R6/lib/X11/config/sco.cf
-usr/X11R6/lib/X11/config/sco5.cf
-usr/X11R6/lib/X11/config/sequent.cf
-usr/X11R6/lib/X11/config/sgi.cf
-usr/X11R6/lib/X11/config/sony.cf
-usr/X11R6/lib/X11/config/sun.cf
-usr/X11R6/lib/X11/config/svr3.cf
-usr/X11R6/lib/X11/config/svr4.cf
-usr/X11R6/lib/X11/config/ultrix.cf
-usr/X11R6/lib/X11/config/usl.cf
-usr/X11R6/lib/X11/config/lynx.cf
-usr/X11R6/lib/X11/config/x386.cf
-usr/X11R6/lib/X11/config/QNX4.cf
-usr/X11R6/lib/X11/config/darwin.cf
-usr/X11R6/lib/X11/config/xfree86.cf
-usr/X11R6/lib/X11/config/xorg.cf
+usr/lib/X11/config/Imake.rules
+usr/lib/X11/config/Motif.rules
+usr/lib/X11/config/Win32.rules
+usr/lib/X11/config/X11.rules
+usr/lib/X11/config/bsdLib.rules
+usr/lib/X11/config/cde.rules
+usr/lib/X11/config/cygwin.rules
+usr/lib/X11/config/darwinLib.rules
+usr/lib/X11/config/gnuLib.rules
+usr/lib/X11/config/hpLib.rules
+usr/lib/X11/config/ibmLib.rules
+usr/lib/X11/config/lnxLib.rules
+usr/lib/X11/config/lnxdoc.rules
+usr/lib/X11/config/necLib.rules
+usr/lib/X11/config/noop.rules
+usr/lib/X11/config/nto.rules
+usr/lib/X11/config/oldlib.rules
+usr/lib/X11/config/os2.rules
+usr/lib/X11/config/os2Lib.rules
+usr/lib/X11/config/osfLib.rules
+usr/lib/X11/config/scoLib.rules
+usr/lib/X11/config/sgiLib.rules
+usr/lib/X11/config/sunLib.rules
+usr/lib/X11/config/sv3Lib.rules
+usr/lib/X11/config/sv4Lib.rules
+usr/lib/X11/config/QNX4.rules
+usr/lib/X11/config/xf86.rules
+usr/lib/X11/config/Imake.tmpl
+usr/lib/X11/config/Library.tmpl
+usr/lib/X11/config/Motif.tmpl
+usr/lib/X11/config/Server.tmpl
+usr/lib/X11/config/ServerLib.tmpl
+usr/lib/X11/config/Threads.tmpl
+usr/lib/X11/config/WinLib.tmpl
+usr/lib/X11/config/X11.tmpl
+usr/lib/X11/config/bsdLib.tmpl
+usr/lib/X11/config/cde.tmpl
+usr/lib/X11/config/cygwin.tmpl
+usr/lib/X11/config/darwinLib.tmpl
+usr/lib/X11/config/hpLib.tmpl
+usr/lib/X11/config/gnuLib.tmpl
+usr/lib/X11/config/ibmLib.tmpl
+usr/lib/X11/config/lnxLib.tmpl
+usr/lib/X11/config/lnxdoc.tmpl
+usr/lib/X11/config/necLib.tmpl
+usr/lib/X11/config/os2Lib.tmpl
+usr/lib/X11/config/osfLib.tmpl
+usr/lib/X11/config/sgiLib.tmpl
+usr/lib/X11/config/sunLib.tmpl
+usr/lib/X11/config/sv3Lib.tmpl
+usr/lib/X11/config/sv4Lib.tmpl
+usr/lib/X11/config/xf86.tmpl
+usr/lib/X11/config/xorg.tmpl
+usr/lib/X11/config/xf86site.def
+usr/lib/X11/config/xorgsite.def
+usr/lib/X11/config/date.def
+usr/lib/X11/config/version.def
+usr/lib/X11/config/host.def
+usr/lib/X11/config/site.def
+usr/lib/X11/config/Imake.cf
+usr/lib/X11/config/Amoeba.cf
+usr/lib/X11/config/DGUX.cf
+usr/lib/X11/config/FreeBSD.cf
+usr/lib/X11/config/Mips.cf
+usr/lib/X11/config/NetBSD.cf
+usr/lib/X11/config/OpenBSD.cf
+usr/lib/X11/config/Oki.cf
+usr/lib/X11/config/cygwin.cf
+usr/lib/X11/config/Win32.cf
+usr/lib/X11/config/apollo.cf
+usr/lib/X11/config/bsd.cf
+usr/lib/X11/config/bsdi.cf
+usr/lib/X11/config/convex.cf
+usr/lib/X11/config/cray.cf
+usr/lib/X11/config/fujitsu.cf
+usr/lib/X11/config/generic.cf
+usr/lib/X11/config/gnu.cf
+usr/lib/X11/config/hp.cf
+usr/lib/X11/config/ibm.cf
+usr/lib/X11/config/isc.cf
+usr/lib/X11/config/linux.cf
+usr/lib/X11/config/luna.cf
+usr/lib/X11/config/macII.cf
+usr/lib/X11/config/mach.cf
+usr/lib/X11/config/minix.cf
+usr/lib/X11/config/moto.cf
+usr/lib/X11/config/ncr.cf
+usr/lib/X11/config/nec.cf
+usr/lib/X11/config/nto.cf
+usr/lib/X11/config/os2.cf
+usr/lib/X11/config/osf1.cf
+usr/lib/X11/config/pegasus.cf
+usr/lib/X11/config/sco.cf
+usr/lib/X11/config/sco5.cf
+usr/lib/X11/config/sequent.cf
+usr/lib/X11/config/sgi.cf
+usr/lib/X11/config/sony.cf
+usr/lib/X11/config/sun.cf
+usr/lib/X11/config/svr3.cf
+usr/lib/X11/config/svr4.cf
+usr/lib/X11/config/ultrix.cf
+usr/lib/X11/config/usl.cf
+usr/lib/X11/config/lynx.cf
+usr/lib/X11/config/x386.cf
+usr/lib/X11/config/QNX4.cf
+usr/lib/X11/config/darwin.cf
+usr/lib/X11/config/xfree86.cf
+usr/lib/X11/config/xorg.cf
Modified: xorg-config/trunk/debian/xutils-devel.install
===================================================================
--- xorg-config/trunk/debian/xutils-devel.install 2004-10-06 04:52:21 UTC (rev 32)
+++ xorg-config/trunk/debian/xutils-devel.install 2004-10-07 11:25:12 UTC (rev 33)
@@ -1,42 +1,42 @@
-usr/X11R6/lib/X11/doc/html/imake.1.html
-usr/X11R6/lib/X11/doc/html/makedepend.1.html
-usr/X11R6/lib/X11/doc/html/lndir.1.html
-usr/X11R6/lib/X11/doc/html/makestrs.1.html
-usr/X11R6/lib/X11/doc/html/revpath.1.html
-usr/X11R6/lib/X11/doc/html/xmkmf.1.html
-usr/X11R6/lib/X11/doc/html/mkdirhier.1.html
-usr/X11R6/lib/X11/doc/html/gccmakedep.1.html
-usr/X11R6/lib/X11/doc/html/mergelib.1.html
-usr/X11R6/lib/X11/doc/html/makeg.1.html
-usr/X11R6/lib/X11/doc/html/cleanlinks.1.html
-usr/X11R6/lib/X11/doc/html/mkhtmlindex.1.html
-usr/X11R6/lib/X11/doc/html/ccmakedep.1.html
-usr/X11R6/lib/X11/doc/html/pswrap.1.html
-usr/X11R6/bin/imake
-usr/X11R6/bin/makedepend
-usr/X11R6/bin/lndir
-usr/X11R6/bin/makestrs
-usr/X11R6/bin/revpath
-usr/X11R6/bin/xmkmf
-usr/X11R6/bin/mkdirhier
-usr/X11R6/bin/gccmakedep
-usr/X11R6/bin/mergelib
-usr/X11R6/bin/makeg
-usr/X11R6/bin/cleanlinks
-usr/X11R6/bin/mkhtmlindex
-usr/X11R6/bin/ccmakedep
-usr/X11R6/bin/pswrap
-usr/X11R6/man/man1/imake.1x
-usr/X11R6/man/man1/makedepend.1x
-usr/X11R6/man/man1/lndir.1x
-usr/X11R6/man/man1/makestrs.1x
-usr/X11R6/man/man1/revpath.1x
-usr/X11R6/man/man1/xmkmf.1x
-usr/X11R6/man/man1/mkdirhier.1x
-usr/X11R6/man/man1/gccmakedep.1x
-usr/X11R6/man/man1/mergelib.1x
-usr/X11R6/man/man1/makeg.1x
-usr/X11R6/man/man1/cleanlinks.1x
-usr/X11R6/man/man1/mkhtmlindex.1x
-usr/X11R6/man/man1/ccmakedep.1x
-usr/X11R6/man/man1/pswrap.1x
+usr/lib/X11/doc/html/imake.1.html
+usr/lib/X11/doc/html/makedepend.1.html
+usr/lib/X11/doc/html/lndir.1.html
+usr/lib/X11/doc/html/makestrs.1.html
+usr/lib/X11/doc/html/revpath.1.html
+usr/lib/X11/doc/html/xmkmf.1.html
+usr/lib/X11/doc/html/mkdirhier.1.html
+usr/lib/X11/doc/html/gccmakedep.1.html
+usr/lib/X11/doc/html/mergelib.1.html
+usr/lib/X11/doc/html/makeg.1.html
+usr/lib/X11/doc/html/cleanlinks.1.html
+usr/lib/X11/doc/html/mkhtmlindex.1.html
+usr/lib/X11/doc/html/ccmakedep.1.html
+usr/lib/X11/doc/html/pswrap.1.html
+usr/bin/imake
+usr/bin/makedepend
+usr/bin/lndir
+usr/bin/makestrs
+usr/bin/revpath
+usr/bin/xmkmf
+usr/bin/mkdirhier
+usr/bin/gccmakedep
+usr/bin/mergelib
+usr/bin/makeg
+usr/bin/cleanlinks
+usr/bin/mkhtmlindex
+usr/bin/ccmakedep
+usr/bin/pswrap
+usr/man/man1/imake.1x
+usr/man/man1/makedepend.1x
+usr/man/man1/lndir.1x
+usr/man/man1/makestrs.1x
+usr/man/man1/revpath.1x
+usr/man/man1/xmkmf.1x
+usr/man/man1/mkdirhier.1x
+usr/man/man1/gccmakedep.1x
+usr/man/man1/mergelib.1x
+usr/man/man1/makeg.1x
+usr/man/man1/cleanlinks.1x
+usr/man/man1/mkhtmlindex.1x
+usr/man/man1/ccmakedep.1x
+usr/man/man1/pswrap.1x
Reply to: