X Strike Force XOrg SVN commit: r53 - in xorg-config/trunk/debian: . patches
Author: fabbione
Date: 2004-10-19 03:39:27 -0500 (Tue, 19 Oct 2004)
New Revision: 53
Modified:
xorg-config/trunk/debian/CHANGESETS
xorg-config/trunk/debian/MANIFEST.any
xorg-config/trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff
xorg-config/trunk/debian/patches/004_imake_manpage_handling_overhaul.diff
xorg-config/trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff
xorg-config/trunk/debian/patches/600_amd64_support.diff
xorg-config/trunk/debian/patches/910_debian_kill_X11_and_X11R6.diff
xorg-config/trunk/debian/xutils-devel.install
Log:
* Kill HTML documentation. It is nothing more than what is already
in all the manpages:
+ Update all related files and patches.
+ Add forgotten 004_imake_manpage_handling_overhaul.diff bit
that defines ProjectManSuffix.
Modified: xorg-config/trunk/debian/CHANGESETS
===================================================================
--- xorg-config/trunk/debian/CHANGESETS 2004-10-18 15:01:41 UTC (rev 52)
+++ xorg-config/trunk/debian/CHANGESETS 2004-10-19 08:39:27 UTC (rev 53)
@@ -91,4 +91,11 @@
+ Update xutils-devel.install.
52
+* Kill HTML documentation. It is nothing more than what is already
+ in all the manpages:
+ + Update all related files and patches.
+ + Add forgotten 004_imake_manpage_handling_overhaul.diff bit
+ that defines ProjectManSuffix.
+ 53
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: xorg-config/trunk/debian/MANIFEST.any
===================================================================
--- xorg-config/trunk/debian/MANIFEST.any 2004-10-18 15:01:41 UTC (rev 52)
+++ xorg-config/trunk/debian/MANIFEST.any 2004-10-19 08:39:27 UTC (rev 53)
@@ -12,20 +12,6 @@
usr/bin/pswrap
usr/bin/revpath
usr/bin/xmkmf
-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/lintian/overrides/xutils-devel
usr/share/man/man1/ccmakedep.1
usr/share/man/man1/cleanlinks.1
@@ -42,11 +28,33 @@
usr/share/man/man1/revpath.1
usr/share/man/man1/xmkmf.1
usr/share/xorg/config/Amoeba.cf
+usr/share/xorg/config/DGUX.cf
+usr/share/xorg/config/FreeBSD.cf
+usr/share/xorg/config/Imake.cf
+usr/share/xorg/config/Imake.rules
+usr/share/xorg/config/Imake.tmpl
+usr/share/xorg/config/Library.tmpl
+usr/share/xorg/config/Mips.cf
+usr/share/xorg/config/Motif.rules
+usr/share/xorg/config/Motif.tmpl
+usr/share/xorg/config/NetBSD.cf
+usr/share/xorg/config/Oki.cf
+usr/share/xorg/config/OpenBSD.cf
+usr/share/xorg/config/QNX4.cf
+usr/share/xorg/config/QNX4.rules
+usr/share/xorg/config/Server.tmpl
+usr/share/xorg/config/ServerLib.tmpl
+usr/share/xorg/config/Threads.tmpl
+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/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/bsdi.cf
usr/share/xorg/config/cde.rules
usr/share/xorg/config/cde.tmpl
usr/share/xorg/config/convex.cf
@@ -58,8 +66,6 @@
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
@@ -72,52 +78,38 @@
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/lnxdoc.rules
+usr/share/xorg/config/lnxdoc.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/mach.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/os2.rules
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/sco5.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
@@ -132,23 +124,17 @@
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/xf86site.def
usr/share/xorg/config/xfree86.cf
usr/share/xorg/config/xorg.cf
-usr/share/xorg/config/xorgsite.def
usr/share/xorg/config/xorg.tmpl
+usr/share/xorg/config/xorgsite.def
usr/share/xorg/dbuild-scripts/arch.mk
usr/share/xorg/dbuild-scripts/check-manifest.mk
usr/share/xorg/dbuild-scripts/patch-audit.mk
Modified: xorg-config/trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff
===================================================================
--- xorg-config/trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff 2004-10-18 15:01:41 UTC (rev 52)
+++ xorg-config/trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff 2004-10-19 08:39:27 UTC (rev 53)
@@ -19,8 +19,8 @@
Not submitted to XFree86.
diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
---- xc-old/config/cf/linux.cf 2004-10-18 15:24:50.628326000 +0200
-+++ xc/config/cf/linux.cf 2004-10-18 15:25:19.605921440 +0200
+--- xc-old/config/cf/linux.cf 2004-10-19 10:29:15.764727000 +0200
++++ xc/config/cf/linux.cf 2004-10-19 10:31:23.918245648 +0200
@@ -104,7 +104,23 @@
# if !NothingOutsideProjectRoot
# define SystemManDirectory /usr/share/man
@@ -45,11 +45,24 @@
/* un-comment this when it is un-broken */
/* # define JoystickSupport YES */
# if !NothingOutsideProjectRoot
-@@ -158,34 +174,84 @@
+@@ -149,43 +165,93 @@
+ # define BuilderEMailAddr "debian-x@lists.debian.org"
+ # endif
+ # define XFree86Devel YES
+-# define BuildAllSpecsDocs YES
++# define BuildAllSpecsDocs NO
+ # define InstallXinitConfig YES
+ # define InstallXdmConfig YES
+ # define InstallFSConfig YES
+ # define DebuggableLibraries YES
+ # define ForceNormalLib YES
# define BuildSpecsDocs YES
- # define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n xterm
+-# define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n xterm
++# define SpecsDocDirs BDF CTEXT FSProtocol GL ICCCM ICE PM Render SM X11 XDMCP XIM XLFD XProtocol Xaw Xext Xi Xmu Xserver Xt Xv XvMC i18n rstart xfs xterm xtrans
# define BuildRman NO
--# define BuildHtmlManPages NO
++# define RmanCmd /usr/bin/rman
++# define RmanOptions /**/
+ # define BuildHtmlManPages NO
-
-/* we build-depend on libfreetype6-dev (FreeType 2.x) */
-# define BuildFreetype2Library NO
@@ -58,9 +71,6 @@
-# ifndef Mc68020Architecture
-# define HasLinuxInput YES
-# endif
-+# define RmanCmd /usr/bin/rman
-+# define RmanOptions -f HTML
-+# define BuildHtmlManPages YES
+/*
+ * The XFree86 Debian package uses a local patch that defines a
+ * PicLibraryTarget() Imake rule, instead of using upstream's method.
@@ -336,7 +346,7 @@
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
diff -ruN xc-old/config/cf/xfree86.cf xc/config/cf/xfree86.cf
--- xc-old/config/cf/xfree86.cf 2004-07-07 01:50:59.000000000 +0200
-+++ xc/config/cf/xfree86.cf 2004-10-18 15:24:50.690317280 +0200
++++ xc/config/cf/xfree86.cf 2004-10-19 10:29:15.827718368 +0200
@@ -233,6 +233,11 @@
#define GlideDriver /**/
#endif
Modified: xorg-config/trunk/debian/patches/004_imake_manpage_handling_overhaul.diff
===================================================================
--- xorg-config/trunk/debian/patches/004_imake_manpage_handling_overhaul.diff 2004-10-18 15:01:41 UTC (rev 52)
+++ xorg-config/trunk/debian/patches/004_imake_manpage_handling_overhaul.diff 2004-10-19 08:39:27 UTC (rev 53)
@@ -7,8 +7,8 @@
Forward-ported from 4.3.0 to 6.8.1 by Fabio M. Di Nitto.
diff -ruN xc-old/config/cf/gnu.cf xc/config/cf/gnu.cf
---- xc-old/config/cf/gnu.cf 2004-10-18 13:15:39.555668000 +0200
-+++ xc/config/cf/gnu.cf 2004-10-18 13:15:39.632657152 +0200
+--- xc-old/config/cf/gnu.cf 2004-10-18 17:49:32.087544000 +0200
++++ xc/config/cf/gnu.cf 2004-10-18 17:49:32.166532288 +0200
@@ -146,26 +146,6 @@
#define ConnectionFlags -DUNIXCONN -DTCPCONN
@@ -38,7 +38,7 @@
#endif
diff -ruN xc-old/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
--- xc-old/config/cf/Imake.tmpl 2004-07-28 05:24:29.000000000 +0200
-+++ xc/config/cf/Imake.tmpl 2004-10-18 13:18:13.769224832 +0200
++++ xc/config/cf/Imake.tmpl 2004-10-18 17:49:32.168531984 +0200
@@ -883,37 +883,79 @@
#define ManSourcePath $(MANPATH)/man
#endif
@@ -248,8 +248,16 @@
COMPRESSMANCMD = CompressManCmd
diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
---- xc-old/config/cf/linux.cf 2004-10-18 13:15:39.570666000 +0200
-+++ xc/config/cf/linux.cf 2004-10-18 13:15:39.634656848 +0200
+--- xc-old/config/cf/linux.cf 2004-10-18 17:49:32.103541000 +0200
++++ xc/config/cf/linux.cf 2004-10-18 17:51:15.257860024 +0200
+@@ -183,6 +183,7 @@
+ */
+ # define StaticNeedsPicForShared NO
+ # define KernelVersionInBanner YES
++# define ProjectManSuffix x
+ /* The TT/Meltho fonts are all under non-free licenses. */
+ # define BuildTrueTypeFonts NO
+ # define BuildBethMarduthoFonts NO
@@ -1043,26 +1044,6 @@
# define ConnectionFlags -DUNIXCONN -DTCPCONN
#endif
@@ -278,8 +286,8 @@
# define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
#endif
diff -ruN xc-old/config/cf/xfree86.cf xc/config/cf/xfree86.cf
---- xc-old/config/cf/xfree86.cf 2004-10-18 13:15:39.571666000 +0200
-+++ xc/config/cf/xfree86.cf 2004-10-18 13:15:39.635656696 +0200
+--- xc-old/config/cf/xfree86.cf 2004-10-18 17:49:32.104541000 +0200
++++ xc/config/cf/xfree86.cf 2004-10-18 17:49:32.170531680 +0200
@@ -1842,10 +1842,6 @@
# define UseRgbTxt YES
#endif
Modified: xorg-config/trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff
===================================================================
--- xorg-config/trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff 2004-10-18 15:01:41 UTC (rev 52)
+++ xorg-config/trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff 2004-10-19 08:39:27 UTC (rev 53)
@@ -13,7 +13,7 @@
diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
--- xc-old/config/cf/linux.cf 2004-10-18 14:14:34.492276000 +0200
+++ xc/config/cf/linux.cf 2004-10-18 14:15:09.864899352 +0200
-@@ -206,6 +206,8 @@
+@@ -207,6 +207,8 @@
# define HasRenderLibrary YES
# define BuildXcursorLibrary NO
# define HasXcursorLibrary YES
Modified: xorg-config/trunk/debian/patches/600_amd64_support.diff
===================================================================
--- xorg-config/trunk/debian/patches/600_amd64_support.diff 2004-10-18 15:01:41 UTC (rev 52)
+++ xorg-config/trunk/debian/patches/600_amd64_support.diff 2004-10-19 08:39:27 UTC (rev 53)
@@ -19,7 +19,7 @@
diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
--- xc-old/config/cf/linux.cf 2004-10-18 14:39:52.737468000 +0200
+++ xc/config/cf/linux.cf 2004-10-18 14:41:57.429512384 +0200
-@@ -618,7 +618,7 @@
+@@ -619,7 +619,7 @@
#define MkdirHierCmd mkdir -p
#ifndef HaveLib64
Modified: xorg-config/trunk/debian/patches/910_debian_kill_X11_and_X11R6.diff
===================================================================
--- xorg-config/trunk/debian/patches/910_debian_kill_X11_and_X11R6.diff 2004-10-18 15:01:41 UTC (rev 52)
+++ xorg-config/trunk/debian/patches/910_debian_kill_X11_and_X11R6.diff 2004-10-19 08:39:27 UTC (rev 53)
@@ -9,11 +9,11 @@
+++ xc/config/cf/linux.cf 2004-10-18 15:48:13.609041216 +0200
@@ -174,6 +174,14 @@
# define RmanCmd /usr/bin/rman
- # define RmanOptions -f HTML
- # define BuildHtmlManPages YES
+ # define RmanOptions /**/
+ # define BuildHtmlManPages NO
+/* Kill X11 and X11R6 */
+# define ProjectRoot /usr
-+# define XTop $(TOP)/imports/
++# define XTop $(TOP)
+# define XBuildIncDir $(XBUILDINCROOT)/include
+# define LibDir /usr/lib
+# define ConfigDir /usr/share/xorg/config
Modified: xorg-config/trunk/debian/xutils-devel.install
===================================================================
--- xorg-config/trunk/debian/xutils-devel.install 2004-10-18 15:01:41 UTC (rev 52)
+++ xorg-config/trunk/debian/xutils-devel.install 2004-10-19 08:39:27 UTC (rev 53)
@@ -12,20 +12,6 @@
usr/bin/pswrap
usr/bin/revpath
usr/bin/xmkmf
-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/lintian/overrides/xutils-devel
usr/share/man/man1/ccmakedep.1
usr/share/man/man1/cleanlinks.1
Reply to: