X Strike Force XOrg SVN commit: r59 - in xorg-doc/trunk/debian: . patches
Author: fabbione
Date: 2004-10-19 08:55:18 -0500 (Tue, 19 Oct 2004)
New Revision: 59
Added:
xorg-doc/trunk/debian/patches/023_specs_doc_fixes.diff
xorg-doc/trunk/debian/patches/033_no_html.diff
Modified:
xorg-doc/trunk/debian/CHANGESETS
xorg-doc/trunk/debian/MANIFEST.any
xorg-doc/trunk/debian/xspecs.install
Log:
* Import all xfree86/debian/patches related to xc/doc/
+ Update xspecs.install and MANIFEST.any.
Modified: xorg-doc/trunk/debian/CHANGESETS
===================================================================
--- xorg-doc/trunk/debian/CHANGESETS 2004-10-19 12:59:39 UTC (rev 58)
+++ xorg-doc/trunk/debian/CHANGESETS 2004-10-19 13:55:18 UTC (rev 59)
@@ -31,4 +31,8 @@
+ Resync and sort MANIFEST.any and xspecs.install.
57
+* Import all xfree86/debian/patches related to xc/doc/
+ + Update xspecs.install and MANIFEST.any.
+ 59
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: xorg-doc/trunk/debian/MANIFEST.any
===================================================================
--- xorg-doc/trunk/debian/MANIFEST.any 2004-10-19 12:59:39 UTC (rev 58)
+++ xorg-doc/trunk/debian/MANIFEST.any 2004-10-19 13:55:18 UTC (rev 59)
@@ -75,8 +75,6 @@
usr/share/doc/xorg/evi.txt
usr/share/doc/xorg/fontlib.txt
usr/share/doc/xorg/fsproto.txt
-usr/share/doc/xorg/html/Xprint_FAQ.html
-usr/share/doc/xorg/html/specindex.html
usr/share/doc/xorg/i18nFramework.txt
usr/share/doc/xorg/icccm.txt
usr/share/doc/xorg/ice.txt
Added: xorg-doc/trunk/debian/patches/023_specs_doc_fixes.diff
===================================================================
--- xorg-doc/trunk/debian/patches/023_specs_doc_fixes.diff 2004-10-19 12:59:39 UTC (rev 58)
+++ xorg-doc/trunk/debian/patches/023_specs_doc_fixes.diff 2004-10-19 13:55:18 UTC (rev 59)
@@ -0,0 +1,97 @@
+$Id$
+
+These patches by Jochen Voss.
+
+ There is a minor problem with the table of contents of the
+ xlib manual. The file /usr/share/doc/xspecs/xlib.txt.gz
+ contains the lines (near the end, maybe lines 46417-46419)
+
+ 13.4.3.1. Required Char Set . . . . . . . . . . . . . . 404
+ >N Query Orientation . . . . . . . . . . . . . . . . . . 404
+ 13.4.3.3. Directional Dependent Drawing . . . . . . . . 405
+
+ The number "13.4.3.2" is misprinted there as ">N".
+
+ There is a slightly broken example in the X Toolkit Intrinsics
+ manual. The file /usr/share/doc/xspecs/intrinsics.txt.gz
+ contains the following lines (near line 2211) of example code:
+
+ {
+ Label WidgetClass lwc = (Label WidgetClass)XtClass(w);
+ XtCheckSubclass(w, labelWidgetClass, NULL);
+ *(lwc->label_class.set_text)(w, text)
+ }
+
+ Clearly the "Label WidgetClass lwc = ..." is a syntax error.
+ It should be 'LabelWidgetClass' instead of 'Label WidgetClass'.
+
+ The patch also fixes a minor issue with index file generation.
+
+ There is a minor typo in the X Toolkit Intrinsics manual. The file
+ /usr/share/doc/xspecs/intrinsics.txt.gz contains (near line 24724) the
+ sentence:
+
+ In Release 4 there is no requirement that all composite
+ widgets implement the extra functionality required to
+ manage windowless children, so the accept_objects field
+ allows a composite widget to declare that it is not
+ prepared to do so.
+
+ In fact the corresponding field of CompositeClassExtensionRec is
+ called 'accepts_objects' instead of 'accept_objects'.
+
+Not submitted upstream yet.
+
+diff -ur xc/doc/specs/X11/CH13 xc/doc/specs/X11/CH13
+--- xc/doc/specs/X11/CH13 Tue Dec 24 11:13:33 1996
++++ xc/doc/specs/X11/CH13 Fri Oct 15 02:17:47 1999
+@@ -922,7 +922,7 @@
+ .NH 4
+ Query Orientation
+ .XS
+-\(*SN Query Orientation
++\*(SN Query Orientation
+ .XE
+ .LP
+ The
+--- xc/doc/specs/Xt/CH01~ 2002-09-01 17:53:36.000000000 -0500
++++ xc/doc/specs/Xt/CH01 2002-09-01 17:55:00.000000000 -0500
+@@ -235,7 +235,7 @@
+ \*(SN Core Widgets
+ .XE
+ .LP
+-.IN "Core" "" "@DEF"
++.IN "Core" "" "@DEF@"
+ The
+ Core
+ widget class contains the definitions of fields common to all widgets.
+@@ -306,7 +306,7 @@
+ .PN CoreWidgetClass
+ are defined with only this set of fields.
+ .LP
+-.IN "Core" "" "@DEF@"
++.IN "Core"
+ .IN "WidgetClass" "" "@DEF@"
+ .IN "CoreWidgetClass" "" "@DEF@"
+ .sM
+@@ -1701,7 +1701,7 @@
+ Widget w;
+ String text;
+ {
+- Label WidgetClass lwc = (Label WidgetClass)XtClass(w);
++ LabelWidgetClass lwc = (LabelWidgetClass)XtClass(w);
+ XtCheckSubclass(w, labelWidgetClass, NULL);
+ *(lwc->label_class.set_text)(w, text)
+ }
+diff -ur xc/doc/specs/Xt/CH13 xc/doc/specs/Xt/CH13
+--- xc/doc/specs/Xt/CH13 Wed Jan 3 08:50:07 1996
++++ xc/doc/specs/Xt/CH13 Fri Oct 15 02:17:47 1999
+@@ -298,7 +298,7 @@
+ application attempts to create a nonwidget child. In Release 4 there
+ is no requirement that all composite widgets implement the extra
+ functionality required to manage windowless children, so the
+-\fIaccept_objects\fP field allows a composite widget to declare that it
++\fIaccepts_objects\fP field allows a composite widget to declare that it
+ is not prepared to do so.
+
+ .NH 2
Property changes on: xorg-doc/trunk/debian/patches/023_specs_doc_fixes.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Added: xorg-doc/trunk/debian/patches/033_no_html.diff
===================================================================
--- xorg-doc/trunk/debian/patches/033_no_html.diff 2004-10-19 12:59:39 UTC (rev 58)
+++ xorg-doc/trunk/debian/patches/033_no_html.diff 2004-10-19 13:55:18 UTC (rev 59)
@@ -0,0 +1,33 @@
+$Id$
+
+Don't install specindex.html and Xprint_FAQ.html, since we don't ship html
+documentation.
+
+Original patch by Branden Robinson.
+Modified by Fabio M. Di Nitto.
+
+diff -ruN xc-old/doc/hardcopy/XPRINT/Imakefile xc/doc/hardcopy/XPRINT/Imakefile
+--- xc-old/doc/hardcopy/XPRINT/Imakefile 2004-07-19 21:07:32.000000000 +0000
++++ xc/doc/hardcopy/XPRINT/Imakefile 2004-10-19 13:41:47.793986184 +0000
+@@ -1,6 +1,10 @@
+ XCOMM $Xorg: Imakefile,v 1.1 2004/07/19 19:41:53 gisburn Exp $
+
+ InstallHardcopyDoc(dtprint_fspec,dtprint_fspec.PS.gz)
++
++#if !BuildHtmlManPages
++NOHTML = YES
++#endif
+ InstallDoc(Xprint_FAQ,Xprint_FAQ.html Xprint_FAQ.txt)
+
+ #ifdef HasDocBookTools
+diff -ruN xc-old/doc/specs/Imakefile xc/doc/specs/Imakefile
+--- xc-old/doc/specs/Imakefile 2004-04-23 18:42:15.000000000 +0000
++++ xc/doc/specs/Imakefile 2004-10-19 13:24:23.531738176 +0000
+@@ -21,5 +21,6 @@
+ MakeSubdirs($(SUBDIRS))
+ DependSubdirs($(SUBDIRS))
+
++#if BuildHtmlManPages
+ InstallDoc(specindex,specindex.html)
+-
++#endif
Property changes on: xorg-doc/trunk/debian/patches/033_no_html.diff
___________________________________________________________________
Name: svn:keyword
+ Id
Modified: xorg-doc/trunk/debian/xspecs.install
===================================================================
--- xorg-doc/trunk/debian/xspecs.install 2004-10-19 12:59:39 UTC (rev 58)
+++ xorg-doc/trunk/debian/xspecs.install 2004-10-19 13:55:18 UTC (rev 59)
@@ -75,8 +75,6 @@
usr/share/doc/xorg/evi.txt
usr/share/doc/xorg/fontlib.txt
usr/share/doc/xorg/fsproto.txt
-usr/share/doc/xorg/html/Xprint_FAQ.html
-usr/share/doc/xorg/html/specindex.html
usr/share/doc/xorg/i18nFramework.txt
usr/share/doc/xorg/icccm.txt
usr/share/doc/xorg/ice.txt
Reply to: