X Strike Force XOrg SVN commit: r34 - in xorg-config/trunk/debian: . patches
Author: fabbione
Date: 2004-10-07 06:46:39 -0500 (Thu, 07 Oct 2004)
New Revision: 34
Modified:
xorg-config/trunk/debian/CHANGESETS
xorg-config/trunk/debian/patches/901_kill_X11R6
xorg-config/trunk/debian/xutils-devel.install
Log:
Set ManDirectoryRoot to /usr/share/man.
Update debian/xutils-devel.install.
Modified: xorg-config/trunk/debian/CHANGESETS
===================================================================
--- xorg-config/trunk/debian/CHANGESETS 2004-10-07 11:25:12 UTC (rev 33)
+++ xorg-config/trunk/debian/CHANGESETS 2004-10-07 11:46:39 UTC (rev 34)
@@ -15,7 +15,12 @@
Set Id and vim modelines.
32
-* Start killing X11R6
+* Start killing X11R6:
+ + Set ProjectRoot /usr.
+ + Update debian/*.install files.
33
+ + Set ManDirectoryRoot to /usr/share/man.
+ + Update debian/xutils-devel.install.
+ 34
vim:set ai et sts=4 sw=4 tw=80:
Modified: xorg-config/trunk/debian/patches/901_kill_X11R6
===================================================================
--- xorg-config/trunk/debian/patches/901_kill_X11R6 2004-10-07 11:25:12 UTC (rev 33)
+++ xorg-config/trunk/debian/patches/901_kill_X11R6 2004-10-07 11:46:39 UTC (rev 34)
@@ -1,6 +1,18 @@
+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
+@@ -871,7 +871,7 @@
+ #endif
+ #ifndef ManDirectoryRoot
+ #ifdef ProjectRoot
+-#define ManDirectoryRoot Concat(ProjectRoot,/man)
++#define ManDirectoryRoot Concat(ProjectRoot,/share/man)
+ #else
+ #define ManDirectoryRoot SystemManDirectory
+ #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:20:54.854881712 +0200
++++ xc/config/cf/site.def 2004-10-07 13:36:26.757211024 +0200
@@ -72,7 +72,7 @@
#ifdef AfterVendorCF
Modified: xorg-config/trunk/debian/xutils-devel.install
===================================================================
--- xorg-config/trunk/debian/xutils-devel.install 2004-10-07 11:25:12 UTC (rev 33)
+++ xorg-config/trunk/debian/xutils-devel.install 2004-10-07 11:46:39 UTC (rev 34)
@@ -26,17 +26,17 @@
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
+usr/share/man/man1/imake.1x
+usr/share/man/man1/makedepend.1x
+usr/share/man/man1/lndir.1x
+usr/share/man/man1/makestrs.1x
+usr/share/man/man1/revpath.1x
+usr/share/man/man1/xmkmf.1x
+usr/share/man/man1/mkdirhier.1x
+usr/share/man/man1/gccmakedep.1x
+usr/share/man/man1/mergelib.1x
+usr/share/man/man1/makeg.1x
+usr/share/man/man1/cleanlinks.1x
+usr/share/man/man1/mkhtmlindex.1x
+usr/share/man/man1/ccmakedep.1x
+usr/share/man/man1/pswrap.1x
Reply to: