Author: dnusinow
Date: 2006-02-28 22:40:22 -0500 (Tue, 28 Feb 2006)
New Revision: 1360
Added:
branches/modular/doc/xorg-docs-X11R7.0-1.0.1/debian/patches/
branches/modular/doc/xorg-docs-X11R7.0-1.0.1/debian/patches/01_specs_docs_fixes.diff
branches/modular/doc/xorg-docs-X11R7.0-1.0.1/debian/patches/series
Modified:
branches/modular/doc/xorg-docs-X11R7.0-1.0.1/debian/changelog
branches/modular/doc/xorg-docs-X11R7.0-1.0.1/debian/rules
Log:
* Port patches from trunk
+ general/023_specs_doc_fixes.diff
Modified: branches/modular/doc/xorg-docs-X11R7.0-1.0.1/debian/changelog
===================================================================
--- branches/modular/doc/xorg-docs-X11R7.0-1.0.1/debian/changelog
2006-03-01 03:08:51 UTC (rev 1359)
+++ branches/modular/doc/xorg-docs-X11R7.0-1.0.1/debian/changelog
2006-03-01 03:40:22 UTC (rev 1360)
@@ -1,5 +1,7 @@
xspecs (1:1.0.1-1) experimental; urgency=low
* First modular upload to Debian
+ * Port patches from trunk
+ + general/023_specs_doc_fixes.diff
- -- David Nusinow <[EMAIL PROTECTED]> Thu, 23 Feb 2006 21:03:21 -0500
+ -- David Nusinow <[EMAIL PROTECTED]> Tue, 28 Feb 2006 22:39:28 -0500
Added:
branches/modular/doc/xorg-docs-X11R7.0-1.0.1/debian/patches/01_specs_docs_fixes.diff
===================================================================
---
branches/modular/doc/xorg-docs-X11R7.0-1.0.1/debian/patches/01_specs_docs_fixes.diff
2006-03-01 03:08:51 UTC (rev 1359)
+++
branches/modular/doc/xorg-docs-X11R7.0-1.0.1/debian/patches/01_specs_docs_fixes.diff
2006-03-01 03:40:22 UTC (rev 1360)
@@ -0,0 +1,97 @@
+$Id: 023_specs_doc_fixes.diff 396 2005-07-22 21:45:02Z dnusinow $
+
+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
Added: branches/modular/doc/xorg-docs-X11R7.0-1.0.1/debian/patches/series
===================================================================
--- branches/modular/doc/xorg-docs-X11R7.0-1.0.1/debian/patches/series
2006-03-01 03:08:51 UTC (rev 1359)
+++ branches/modular/doc/xorg-docs-X11R7.0-1.0.1/debian/patches/series
2006-03-01 03:40:22 UTC (rev 1360)
@@ -0,0 +1 @@
+01_specs_docs_fixes.diff -p2
Modified: branches/modular/doc/xorg-docs-X11R7.0-1.0.1/debian/rules
===================================================================
--- branches/modular/doc/xorg-docs-X11R7.0-1.0.1/debian/rules 2006-03-01
03:08:51 UTC (rev 1359)
+++ branches/modular/doc/xorg-docs-X11R7.0-1.0.1/debian/rules 2006-03-01
03:40:22 UTC (rev 1360)
@@ -33,7 +33,7 @@
confflags += --enable-man-pages=3
-build: build-stamp
+build: patch build-stamp
build-stamp:
dh_testdir
@@ -46,7 +46,7 @@
touch build-stamp
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
