X Strike Force XOrg SVN commit: r37 - in xorg-config/trunk/debian: . patches
Author: fabbione
Date: 2004-10-07 14:59:32 -0500 (Thu, 07 Oct 2004)
New Revision: 37
Modified:
xorg-config/trunk/debian/CHANGESETS
xorg-config/trunk/debian/patches/901_kill_X11R6
xorg-config/trunk/debian/xutils-devel.install
Log:
Set LibDir to /usr/lib.
Set DocDir to /usr/share/doc/xorg.
Update debian/xutils-devel.install.
Modified: xorg-config/trunk/debian/CHANGESETS
===================================================================
--- xorg-config/trunk/debian/CHANGESETS 2004-10-07 19:21:41 UTC (rev 36)
+++ xorg-config/trunk/debian/CHANGESETS 2004-10-07 19:59:32 UTC (rev 37)
@@ -15,13 +15,17 @@
Set Id and vim modelines.
32
-* Start killing X11R6:
+* Start killing X11R6 and X11:
+ Set ProjectRoot /usr.
+ Update debian/*.install files.
33
+ Set ManDirectoryRoot to /usr/share/man.
+ Update debian/xutils-devel.install.
34
+ + Set LibDir to /usr/lib.
+ + Set DocDir to /usr/share/doc/xorg.
+ + Update debian/xutils-devel.install.
+ 37
* Remove useless package split.
35
Modified: xorg-config/trunk/debian/patches/901_kill_X11R6
===================================================================
--- xorg-config/trunk/debian/patches/901_kill_X11R6 2004-10-07 19:21:41 UTC (rev 36)
+++ xorg-config/trunk/debian/patches/901_kill_X11R6 2004-10-07 19:59:32 UTC (rev 37)
@@ -1,6 +1,6 @@
diff -ruN xc-old/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
---- xc-old/config/cf/Imake.tmpl 2004-10-07 13:36:26.638229000 +0200
-+++ xc/config/cf/Imake.tmpl 2004-10-07 13:40:48.755381248 +0200
+--- xc-old/config/cf/Imake.tmpl 2004-10-07 21:32:21.565220000 +0200
++++ xc/config/cf/Imake.tmpl 2004-10-07 21:32:21.660205936 +0200
@@ -871,7 +871,7 @@
#endif
#ifndef ManDirectoryRoot
@@ -12,7 +12,7 @@
#endif
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:36:26.757211024 +0200
++++ xc/config/cf/site.def 2004-10-07 21:32:21.661205784 +0200
@@ -72,7 +72,7 @@
#ifdef AfterVendorCF
@@ -22,3 +22,31 @@
#endif
/*
+diff -ruN xc-old/config/cf/X11.tmpl xc/config/cf/X11.tmpl
+--- xc-old/config/cf/X11.tmpl 2004-09-03 18:18:18.000000000 +0200
++++ xc/config/cf/X11.tmpl 2004-10-07 21:51:46.418135816 +0200
+@@ -1464,9 +1464,9 @@
+ #endif
+ #ifndef LibDir
+ # ifdef ProjectRoot
+-# define LibDir Concat(ProjectRoot,/lib/X11)
++# define LibDir Concat(ProjectRoot,/lib)
+ # else
+-# define LibDir /usr/lib/X11
++# define LibDir /usr/lib
+ # endif
+ #endif
+ #ifndef ModuleDir
+@@ -1483,10 +1483,10 @@
+ #endif
+ #endif
+ #ifndef ConfigDir
+-#define ConfigDir $(LIBDIR)/config
++#define ConfigDir /usr/share/xorg/config
+ #endif
+ #ifndef DocDir
+-#define DocDir $(LIBDIR)/doc
++#define DocDir /usr/share/doc/xorg
+ #endif
+ #ifndef DocHtmlDir
+ #define DocHtmlDir $(DOCDIR)/html
Modified: xorg-config/trunk/debian/xutils-devel.install
===================================================================
--- xorg-config/trunk/debian/xutils-devel.install 2004-10-07 19:21:41 UTC (rev 36)
+++ xorg-config/trunk/debian/xutils-devel.install 2004-10-07 19:59:32 UTC (rev 37)
@@ -12,128 +12,20 @@
usr/bin/pswrap
usr/bin/revpath
usr/bin/xmkmf
-usr/lib/X11/config/Amoeba.cf
-usr/lib/X11/config/apollo.cf
-usr/lib/X11/config/bsd.cf
-usr/lib/X11/config/bsdi.cf
-usr/lib/X11/config/bsdLib.rules
-usr/lib/X11/config/bsdLib.tmpl
-usr/lib/X11/config/cde.rules
-usr/lib/X11/config/cde.tmpl
-usr/lib/X11/config/convex.cf
-usr/lib/X11/config/cray.cf
-usr/lib/X11/config/cygwin.cf
-usr/lib/X11/config/cygwin.rules
-usr/lib/X11/config/cygwin.tmpl
-usr/lib/X11/config/darwin.cf
-usr/lib/X11/config/darwinLib.rules
-usr/lib/X11/config/darwinLib.tmpl
-usr/lib/X11/config/date.def
-usr/lib/X11/config/DGUX.cf
-usr/lib/X11/config/FreeBSD.cf
-usr/lib/X11/config/fujitsu.cf
-usr/lib/X11/config/generic.cf
-usr/lib/X11/config/gnu.cf
-usr/lib/X11/config/gnuLib.rules
-usr/lib/X11/config/gnuLib.tmpl
-usr/lib/X11/config/host.def
-usr/lib/X11/config/hp.cf
-usr/lib/X11/config/hpLib.rules
-usr/lib/X11/config/hpLib.tmpl
-usr/lib/X11/config/ibm.cf
-usr/lib/X11/config/ibmLib.rules
-usr/lib/X11/config/ibmLib.tmpl
-usr/lib/X11/config/Imake.cf
-usr/lib/X11/config/Imake.rules
-usr/lib/X11/config/Imake.tmpl
-usr/lib/X11/config/isc.cf
-usr/lib/X11/config/Library.tmpl
-usr/lib/X11/config/linux.cf
-usr/lib/X11/config/lnxdoc.rules
-usr/lib/X11/config/lnxdoc.tmpl
-usr/lib/X11/config/lnxLib.rules
-usr/lib/X11/config/lnxLib.tmpl
-usr/lib/X11/config/luna.cf
-usr/lib/X11/config/lynx.cf
-usr/lib/X11/config/mach.cf
-usr/lib/X11/config/macII.cf
-usr/lib/X11/config/minix.cf
-usr/lib/X11/config/Mips.cf
-usr/lib/X11/config/Motif.rules
-usr/lib/X11/config/Motif.tmpl
-usr/lib/X11/config/moto.cf
-usr/lib/X11/config/ncr.cf
-usr/lib/X11/config/nec.cf
-usr/lib/X11/config/necLib.rules
-usr/lib/X11/config/necLib.tmpl
-usr/lib/X11/config/NetBSD.cf
-usr/lib/X11/config/noop.rules
-usr/lib/X11/config/nto.cf
-usr/lib/X11/config/nto.rules
-usr/lib/X11/config/Oki.cf
-usr/lib/X11/config/oldlib.rules
-usr/lib/X11/config/OpenBSD.cf
-usr/lib/X11/config/os2.cf
-usr/lib/X11/config/os2Lib.rules
-usr/lib/X11/config/os2Lib.tmpl
-usr/lib/X11/config/os2.rules
-usr/lib/X11/config/osf1.cf
-usr/lib/X11/config/osfLib.rules
-usr/lib/X11/config/osfLib.tmpl
-usr/lib/X11/config/pegasus.cf
-usr/lib/X11/config/QNX4.cf
-usr/lib/X11/config/QNX4.rules
-usr/lib/X11/config/sco5.cf
-usr/lib/X11/config/sco.cf
-usr/lib/X11/config/scoLib.rules
-usr/lib/X11/config/sequent.cf
-usr/lib/X11/config/ServerLib.tmpl
-usr/lib/X11/config/Server.tmpl
-usr/lib/X11/config/sgi.cf
-usr/lib/X11/config/sgiLib.rules
-usr/lib/X11/config/sgiLib.tmpl
-usr/lib/X11/config/site.def
-usr/lib/X11/config/sony.cf
-usr/lib/X11/config/sun.cf
-usr/lib/X11/config/sunLib.rules
-usr/lib/X11/config/sunLib.tmpl
-usr/lib/X11/config/sv3Lib.rules
-usr/lib/X11/config/sv3Lib.tmpl
-usr/lib/X11/config/sv4Lib.rules
-usr/lib/X11/config/sv4Lib.tmpl
-usr/lib/X11/config/svr3.cf
-usr/lib/X11/config/svr4.cf
-usr/lib/X11/config/Threads.tmpl
-usr/lib/X11/config/ultrix.cf
-usr/lib/X11/config/usl.cf
-usr/lib/X11/config/version.def
-usr/lib/X11/config/Win32.cf
-usr/lib/X11/config/Win32.rules
-usr/lib/X11/config/WinLib.tmpl
-usr/lib/X11/config/X11.rules
-usr/lib/X11/config/X11.tmpl
-usr/lib/X11/config/x386.cf
-usr/lib/X11/config/xf86.rules
-usr/lib/X11/config/xf86site.def
-usr/lib/X11/config/xf86.tmpl
-usr/lib/X11/config/xfree86.cf
-usr/lib/X11/config/xorg.cf
-usr/lib/X11/config/xorgsite.def
-usr/lib/X11/config/xorg.tmpl
-usr/lib/X11/doc/html/ccmakedep.1.html
-usr/lib/X11/doc/html/cleanlinks.1.html
-usr/lib/X11/doc/html/gccmakedep.1.html
-usr/lib/X11/doc/html/imake.1.html
-usr/lib/X11/doc/html/lndir.1.html
-usr/lib/X11/doc/html/makedepend.1.html
-usr/lib/X11/doc/html/makeg.1.html
-usr/lib/X11/doc/html/makestrs.1.html
-usr/lib/X11/doc/html/mergelib.1.html
-usr/lib/X11/doc/html/mkdirhier.1.html
-usr/lib/X11/doc/html/mkhtmlindex.1.html
-usr/lib/X11/doc/html/pswrap.1.html
-usr/lib/X11/doc/html/revpath.1.html
-usr/lib/X11/doc/html/xmkmf.1.html
+usr/share/doc/xorg/html/ccmakedep.1.html
+usr/share/doc/xorg/html/cleanlinks.1.html
+usr/share/doc/xorg/html/gccmakedep.1.html
+usr/share/doc/xorg/html/imake.1.html
+usr/share/doc/xorg/html/lndir.1.html
+usr/share/doc/xorg/html/makedepend.1.html
+usr/share/doc/xorg/html/makeg.1.html
+usr/share/doc/xorg/html/makestrs.1.html
+usr/share/doc/xorg/html/mergelib.1.html
+usr/share/doc/xorg/html/mkdirhier.1.html
+usr/share/doc/xorg/html/mkhtmlindex.1.html
+usr/share/doc/xorg/html/pswrap.1.html
+usr/share/doc/xorg/html/revpath.1.html
+usr/share/doc/xorg/html/xmkmf.1.html
usr/share/man/man1/ccmakedep.1x
usr/share/man/man1/cleanlinks.1x
usr/share/man/man1/gccmakedep.1x
@@ -148,3 +40,111 @@
usr/share/man/man1/pswrap.1x
usr/share/man/man1/revpath.1x
usr/share/man/man1/xmkmf.1x
+usr/share/xorg/config/Amoeba.cf
+usr/share/xorg/config/apollo.cf
+usr/share/xorg/config/bsd.cf
+usr/share/xorg/config/bsdi.cf
+usr/share/xorg/config/bsdLib.rules
+usr/share/xorg/config/bsdLib.tmpl
+usr/share/xorg/config/cde.rules
+usr/share/xorg/config/cde.tmpl
+usr/share/xorg/config/convex.cf
+usr/share/xorg/config/cray.cf
+usr/share/xorg/config/cygwin.cf
+usr/share/xorg/config/cygwin.rules
+usr/share/xorg/config/cygwin.tmpl
+usr/share/xorg/config/darwin.cf
+usr/share/xorg/config/darwinLib.rules
+usr/share/xorg/config/darwinLib.tmpl
+usr/share/xorg/config/date.def
+usr/share/xorg/config/DGUX.cf
+usr/share/xorg/config/FreeBSD.cf
+usr/share/xorg/config/fujitsu.cf
+usr/share/xorg/config/generic.cf
+usr/share/xorg/config/gnu.cf
+usr/share/xorg/config/gnuLib.rules
+usr/share/xorg/config/gnuLib.tmpl
+usr/share/xorg/config/host.def
+usr/share/xorg/config/hp.cf
+usr/share/xorg/config/hpLib.rules
+usr/share/xorg/config/hpLib.tmpl
+usr/share/xorg/config/ibm.cf
+usr/share/xorg/config/ibmLib.rules
+usr/share/xorg/config/ibmLib.tmpl
+usr/share/xorg/config/Imake.cf
+usr/share/xorg/config/Imake.rules
+usr/share/xorg/config/Imake.tmpl
+usr/share/xorg/config/isc.cf
+usr/share/xorg/config/Library.tmpl
+usr/share/xorg/config/linux.cf
+usr/share/xorg/config/lnxdoc.rules
+usr/share/xorg/config/lnxdoc.tmpl
+usr/share/xorg/config/lnxLib.rules
+usr/share/xorg/config/lnxLib.tmpl
+usr/share/xorg/config/luna.cf
+usr/share/xorg/config/lynx.cf
+usr/share/xorg/config/mach.cf
+usr/share/xorg/config/macII.cf
+usr/share/xorg/config/minix.cf
+usr/share/xorg/config/Mips.cf
+usr/share/xorg/config/Motif.rules
+usr/share/xorg/config/Motif.tmpl
+usr/share/xorg/config/moto.cf
+usr/share/xorg/config/ncr.cf
+usr/share/xorg/config/nec.cf
+usr/share/xorg/config/necLib.rules
+usr/share/xorg/config/necLib.tmpl
+usr/share/xorg/config/NetBSD.cf
+usr/share/xorg/config/noop.rules
+usr/share/xorg/config/nto.cf
+usr/share/xorg/config/nto.rules
+usr/share/xorg/config/Oki.cf
+usr/share/xorg/config/oldlib.rules
+usr/share/xorg/config/OpenBSD.cf
+usr/share/xorg/config/os2.cf
+usr/share/xorg/config/os2Lib.rules
+usr/share/xorg/config/os2Lib.tmpl
+usr/share/xorg/config/os2.rules
+usr/share/xorg/config/osf1.cf
+usr/share/xorg/config/osfLib.rules
+usr/share/xorg/config/osfLib.tmpl
+usr/share/xorg/config/pegasus.cf
+usr/share/xorg/config/QNX4.cf
+usr/share/xorg/config/QNX4.rules
+usr/share/xorg/config/sco5.cf
+usr/share/xorg/config/sco.cf
+usr/share/xorg/config/scoLib.rules
+usr/share/xorg/config/sequent.cf
+usr/share/xorg/config/ServerLib.tmpl
+usr/share/xorg/config/Server.tmpl
+usr/share/xorg/config/sgi.cf
+usr/share/xorg/config/sgiLib.rules
+usr/share/xorg/config/sgiLib.tmpl
+usr/share/xorg/config/site.def
+usr/share/xorg/config/sony.cf
+usr/share/xorg/config/sun.cf
+usr/share/xorg/config/sunLib.rules
+usr/share/xorg/config/sunLib.tmpl
+usr/share/xorg/config/sv3Lib.rules
+usr/share/xorg/config/sv3Lib.tmpl
+usr/share/xorg/config/sv4Lib.rules
+usr/share/xorg/config/sv4Lib.tmpl
+usr/share/xorg/config/svr3.cf
+usr/share/xorg/config/svr4.cf
+usr/share/xorg/config/Threads.tmpl
+usr/share/xorg/config/ultrix.cf
+usr/share/xorg/config/usl.cf
+usr/share/xorg/config/version.def
+usr/share/xorg/config/Win32.cf
+usr/share/xorg/config/Win32.rules
+usr/share/xorg/config/WinLib.tmpl
+usr/share/xorg/config/X11.rules
+usr/share/xorg/config/X11.tmpl
+usr/share/xorg/config/x386.cf
+usr/share/xorg/config/xf86.rules
+usr/share/xorg/config/xf86site.def
+usr/share/xorg/config/xf86.tmpl
+usr/share/xorg/config/xfree86.cf
+usr/share/xorg/config/xorg.cf
+usr/share/xorg/config/xorgsite.def
+usr/share/xorg/config/xorg.tmpl
Reply to: