jcarr
/
x11-xserver-utils
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Update 11_xkb_documentation_updates.diff to not use __manpagesuffix__ 

imakeism
This commit is contained in:
David Nusinow 2006-06-12 01:12:29 +00:00
parent 9f2ebacaca
commit d61c258709
2 changed files with 52 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,4 +1,4 @@
xbase-clients (1:7.1.ds-1) unstable; urgency=low xbase-clients (1:7.1.ds-1) UNRELEASED; urgency=low
[ Steve Langasek ] [ Steve Langasek ]
* Drop broken build-dependency on xprint-utils, no thanks to anonymous * Drop broken build-dependency on xprint-utils, no thanks to anonymous
@ -19,8 +19,10 @@ xbase-clients (1:7.1.ds-1) unstable; urgency=low
* Update xcursorgen to 1.0.1 * Update xcursorgen to 1.0.1
* Autoreconf everything in order to ensure that manpages have the proper * Autoreconf everything in order to ensure that manpages have the proper
section section
* Update 11_xkb_documentation_updates.diff to not use __manpagesuffix__
imakeism
-- David Nusinow <dnusinow@debian.org> Wed, 7 Jun 2006 00:23:15 -0400 -- David Nusinow <dnusinow@debian.org> Sun, 11 Jun 2006 21:12:22 -0400
xbase-clients (1:7.0.1-2) unstable; urgency=low xbase-clients (1:7.0.1-2) unstable; urgency=low

96
debian/patches/11_xkb_documentation_updates.diff vendored
View File

@ -7,14 +7,14 @@ This patch by Branden Robinson.
Index: setxkbmap-1.0.2/setxkbmap.man Index: setxkbmap-1.0.2/setxkbmap.man
=================================================================== ===================================================================
--- setxkbmap-1.0.2/setxkbmap.man.orig 2006-05-01 22:05:38.000000000 -0400 --- setxkbmap-1.0.2/setxkbmap.man.orig 2006-06-11 21:04:12.000000000 -0400
+++ setxkbmap-1.0.2/setxkbmap.man 2006-05-01 22:20:42.000000000 -0400 +++ setxkbmap-1.0.2/setxkbmap.man 2006-06-11 21:08:20.000000000 -0400
@@ -1,120 +1,167 @@ @@ -1,120 +1,167 @@
.\" .\"
.\" $XFree86: xc/programs/setxkbmap/setxkbmap.man,v 3.6 2003/01/20 04:15:08 dawes Exp $ .\" $XFree86: xc/programs/setxkbmap/setxkbmap.man,v 3.6 2003/01/20 04:15:08 dawes Exp $
.\" .\"
-.TH SETXKBMAP 1 __xorgversion__ -.TH SETXKBMAP 1 __xorgversion__
+.TH setxkbmap __mansuffix__ __xorgversion__ +.TH setxkbmap 1 __xorgversion__
.SH NAME .SH NAME
-setxkbmap -setxkbmap
-\- set the keyboard using the X Keyboard Extension -\- set the keyboard using the X Keyboard Extension
@ -162,7 +162,7 @@ Index: setxkbmap-1.0.2/setxkbmap.man
-.TP 8 -.TP 8
+Print component names in a format +Print component names in a format
+acceptable by +acceptable by
+.BR xkbcomp (__mansuffix__) +.BR xkbcomp (1)
+(an XKB keymap compiler) and exit. +(an XKB keymap compiler) and exit.
+This option is useful for testing, or when one needs to run both +This option is useful for testing, or when one needs to run both
+.B setxkbmap +.B setxkbmap
@ -267,25 +267,25 @@ Index: setxkbmap-1.0.2/setxkbmap.man
.SH FILES .SH FILES
.I __projectroot__/lib/X11/xkb .I __projectroot__/lib/X11/xkb
+.SH "SEE ALSO" +.SH "SEE ALSO"
+.BR X (__miscmansuffix__), +.BR X (7),
+.BR xkbbell (__mansuffix__), +.BR xkbbell (1),
+.BR xkbcomp (__mansuffix__), +.BR xkbcomp (1),
+.BR xkbevd (__mansuffix__), +.BR xkbevd (1),
+.BR xkbprint (__mansuffix__), +.BR xkbprint (1),
+.BR xkbvleds (__mansuffix__), +.BR xkbvleds (1),
+.BR xkbwatch (__mansuffix__) +.BR xkbwatch (1)
+.SH COPYRIGHT +.SH COPYRIGHT
+Copyright 1994, Silicon Graphics Computer Systems and X Consortium, Inc. +Copyright 1994, Silicon Graphics Computer Systems and X Consortium, Inc.
+.br +.br
+See +See
+.BR X (__miscmansuffix__) +.BR X (7)
+for a full statement of rights and permissions. +for a full statement of rights and permissions.
+.SH AUTHOR +.SH AUTHOR
+Erik Fortune, Silicon Graphics +Erik Fortune, Silicon Graphics
Index: xkbcomp/README.config Index: xkbcomp/README.config
=================================================================== ===================================================================
--- xkbcomp/README.config.orig 2006-05-01 22:05:38.000000000 -0400 --- xkbcomp/README.config.orig 2006-06-11 21:04:12.000000000 -0400
+++ xkbcomp/README.config 2006-05-01 22:20:42.000000000 -0400 +++ xkbcomp/README.config 2006-06-11 21:06:06.000000000 -0400
@@ -100,7 +100,7 @@ @@ -100,7 +100,7 @@
command loading the same keyboard mapping would look like: command loading the same keyboard mapping would look like:
@ -297,14 +297,14 @@ Index: xkbcomp/README.config
Index: xkbcomp/xkbcomp.man Index: xkbcomp/xkbcomp.man
=================================================================== ===================================================================
--- xkbcomp/xkbcomp.man.orig 2006-05-01 22:05:38.000000000 -0400 --- xkbcomp/xkbcomp.man.orig 2006-06-11 21:04:12.000000000 -0400
+++ xkbcomp/xkbcomp.man 2006-05-01 22:20:42.000000000 -0400 +++ xkbcomp/xkbcomp.man 2006-06-11 21:09:21.000000000 -0400
@@ -5,105 +5,201 @@ @@ -5,105 +5,201 @@
.\" .\"
.\" $XFree86: xc/programs/xkbcomp/xkbcomp.man,v 1.11 2003/07/28 21:57:02 herrb Exp $ .\" $XFree86: xc/programs/xkbcomp/xkbcomp.man,v 1.11 2003/07/28 21:57:02 herrb Exp $
.\" .\"
-.TH XKBCOMP 1 __xorgversion__ -.TH XKBCOMP 1 __xorgversion__
+.TH xkbcomp __mansuffix__ __xorgversion__ +.TH xkbcomp 1 __xorgversion__
.SH NAME .SH NAME
xkbcomp \- compile XKB keyboard description xkbcomp \- compile XKB keyboard description
.SH SYNOPSIS .SH SYNOPSIS
@ -559,32 +559,32 @@ Index: xkbcomp/xkbcomp.man
+extension). +extension).
.SH "SEE ALSO" .SH "SEE ALSO"
-X(__miscmansuffix__) -X(__miscmansuffix__)
+.BR X (__miscmansuffix__), +.BR X (7),
+.BR setxkbmap (__mansuffix__), +.BR setxkbmap (1),
+.BR xkbbell (__mansuffix__), +.BR xkbbell (1),
+.BR xkbevd (__mansuffix__), +.BR xkbevd (1),
+.BR xkbprint (__mansuffix__), +.BR xkbprint (1),
+.BR xkbvleds (__mansuffix__), +.BR xkbvleds (1),
+.BR xkbwatch (__mansuffix__) +.BR xkbwatch (1)
.SH COPYRIGHT .SH COPYRIGHT
Copyright 1994, Silicon Graphics Computer Systems and X Consortium, Inc. Copyright 1994, Silicon Graphics Computer Systems and X Consortium, Inc.
.br .br
-See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions. -See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions.
+See +See
+.BR X (__miscmansuffix__) +.BR X (7)
+for a full statement of rights and permissions. +for a full statement of rights and permissions.
.SH AUTHOR .SH AUTHOR
Erik Fortune, Silicon Graphics Erik Fortune, Silicon Graphics
Index: xkbevd/xkbevd.man Index: xkbevd/xkbevd.man
=================================================================== ===================================================================
--- xkbevd/xkbevd.man.orig 2006-05-01 22:17:33.000000000 -0400 --- xkbevd/xkbevd.man.orig 2006-06-11 21:04:12.000000000 -0400
+++ xkbevd/xkbevd.man 2006-05-01 22:20:42.000000000 -0400 +++ xkbevd/xkbevd.man 2006-06-11 21:10:33.000000000 -0400
@@ -3,98 +3,167 @@ @@ -3,98 +3,167 @@
.\" .\"
.\" $XFree86: xc/programs/xkbevd/xkbevd.man,v 1.7 2001/01/27 18:21:16 dawes Exp $ .\" $XFree86: xc/programs/xkbevd/xkbevd.man,v 1.7 2001/01/27 18:21:16 dawes Exp $
.\" .\"
-.TH XKBEVD 1 __xorgversion__ -.TH XKBEVD 1 __xorgversion__
+.TH xkbevd __mansuffix__ __xorgversion__ +.TH xkbevd 1 __xorgversion__
.SH NAME .SH NAME
xkbevd \- XKB event daemon xkbevd \- XKB event daemon
.SH SYNOPSIS .SH SYNOPSIS
@ -601,7 +601,7 @@ Index: xkbevd/xkbevd.man
+present it here as a rough prototype for developers, not as a general +present it here as a rough prototype for developers, not as a general
+purpose tool for end users. +purpose tool for end users.
+Something like this might make a suitable replacement for +Something like this might make a suitable replacement for
+.BR xev (__mansuffix__); +.BR xev (1);
+I'm not signing up, mind you, but it's an interesting +I'm not signing up, mind you, but it's an interesting
+idea. +idea.
.PP .PP
@ -799,13 +799,13 @@ Index: xkbevd/xkbevd.man
+cause more output, to a point. +cause more output, to a point.
.SH "SEE ALSO" .SH "SEE ALSO"
-X(__miscmansuffix__) -X(__miscmansuffix__)
+.BR X (__miscmansuffix__), +.BR X (7),
+.BR setxkbmap (__mansuffix__), +.BR setxkbmap (1),
+.BR xkbbell (__mansuffix__), +.BR xkbbell (1),
+.BR xkbcomp (__mansuffix__), +.BR xkbcomp (1),
+.BR xkbprint (__mansuffix__), +.BR xkbprint (1),
+.BR xkbvleds (__mansuffix__), +.BR xkbvleds (1),
+.BR xkbwatch (__mansuffix__) +.BR xkbwatch (1)
.SH COPYRIGHT .SH COPYRIGHT
-Copyright 1995, Silicon Graphics Computer Systems -Copyright 1995, Silicon Graphics Computer Systems
-Copyright 1995, 1998 The Open Group -Copyright 1995, 1998 The Open Group
@ -815,20 +815,20 @@ Index: xkbevd/xkbevd.man
.br .br
-See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions. -See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions.
+See +See
+.BR X (__miscmansuffix__) +.BR X (7)
+for a full statement of rights and permissions. +for a full statement of rights and permissions.
.SH AUTHOR .SH AUTHOR
Erik Fortune, Silicon Graphics Erik Fortune, Silicon Graphics
Index: xkbprint-X11R7.0-1.0.1/xkbprint.man Index: xkbprint-X11R7.0-1.0.1/xkbprint.man
=================================================================== ===================================================================
--- xkbprint-X11R7.0-1.0.1/xkbprint.man.orig 2006-04-29 19:23:24.000000000 -0400 --- xkbprint-X11R7.0-1.0.1/xkbprint.man.orig 2006-06-11 21:04:12.000000000 -0400
+++ xkbprint-X11R7.0-1.0.1/xkbprint.man 2006-05-01 22:20:42.000000000 -0400 +++ xkbprint-X11R7.0-1.0.1/xkbprint.man 2006-06-11 21:11:14.000000000 -0400
@@ -2,112 +2,198 @@ @@ -2,112 +2,198 @@
.\" .\"
.\" $XFree86: xc/programs/xkbprint/xkbprint.man,v 1.7 2001/01/27 18:21:16 dawes Exp $ .\" $XFree86: xc/programs/xkbprint/xkbprint.man,v 1.7 2001/01/27 18:21:16 dawes Exp $
.\" .\"
-.TH XKBPRINT 1 __xorgversion__ -.TH XKBPRINT 1 __xorgversion__
+.TH xkbprint __mansuffix__ __xorgversion__ +.TH xkbprint 1 __xorgversion__
.SH NAME .SH NAME
xkbprint \- print an XKB keyboard description xkbprint \- print an XKB keyboard description
.SH SYNOPSIS .SH SYNOPSIS
@ -1083,13 +1083,13 @@ Index: xkbprint-X11R7.0-1.0.1/xkbprint.man
+warnings). +warnings).
.SH "SEE ALSO" .SH "SEE ALSO"
-X(__miscmansuffix__),xkbcomp(1) -X(__miscmansuffix__),xkbcomp(1)
+.BR X (__miscmansuffix__), +.BR X (7),
+.BR setxkbmap (__mansuffix__), +.BR setxkbmap (1),
+.BR xkbbell (__mansuffix__), +.BR xkbbell (1),
+.BR xkbcomp (__mansuffix__), +.BR xkbcomp (1),
+.BR xkbevd (__mansuffix__), +.BR xkbevd (1),
+.BR xkbvleds (__mansuffix__), +.BR xkbvleds (1),
+.BR xkbwatch (__mansuffix__) +.BR xkbwatch (1)
.SH COPYRIGHT .SH COPYRIGHT
Copyright 1995, Silicon Graphics Computer Systems Copyright 1995, Silicon Graphics Computer Systems
-Copyright 1995, 1998 The Open Group -Copyright 1995, 1998 The Open Group
@ -1098,7 +1098,7 @@ Index: xkbprint-X11R7.0-1.0.1/xkbprint.man
+Copyright 1995, 1998 The Open Group +Copyright 1995, 1998 The Open Group
+.br +.br
+See +See
+.BR X (__miscmansuffix__) +.BR X (7)
+for a full statement of rights and permissions. +for a full statement of rights and permissions.
.SH AUTHOR .SH AUTHOR
Erik Fortune, Silicon Graphics Erik Fortune, Silicon Graphics