Bug 7855/Patch 6530: incorrect manpage section suffix

Bug 7855 <https://bugs.freedesktop.org/show_bug.cgi?id=7855>
Patch 6530 <https://bugs.freedesktop.org/attachment.cgi?id=6530>
Based on patch by Fabio M. Di Nitto c/- Colin Watson, Debian Bug#377204.

24 files changed, 44 insertions, 44 deletions

diff --git a/man/Makefile.am b/man/Makefile.am
index 0bd9114..f91efaf 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -72,7 +72,7 @@ XORGRELSTRING = @PACKAGE_STRING@
 SUFFIXES = .$(LIB_MAN_SUFFIX) .man
 
 .man.$(LIB_MAN_SUFFIX):
-	sed 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' < $< > $@
+	sed 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/;  s/__LIB_MAN_SUFFIX__/$(LIB_MAN_SUFFIX)/' < $< > $@
 
 # Generate man page shadow files (Replaces InstallManPageAliases from Imake)
 
diff --git a/man/XAllowDeviceEvents.man b/man/XAllowDeviceEvents.man
index f5f7bae..bb6e990 100644
--- a/man/XAllowDeviceEvents.man
+++ b/man/XAllowDeviceEvents.man
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XAllDvEv.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XAllowDeviceEvents 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XAllowDeviceEvents __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XAllowDeviceEvents \- release queued events
 .SH SYNTAX
@@ -141,6 +141,6 @@ also occur if the specified device is the X keyboard or X pointer device.
 \fIBadValue\fP
 An invalid mode was specified on the request.
 .SH "SEE ALSO"
-XGrabDevice(3X11)
+XGrabDevice(3)
 .br
 \fI\*(xL\fP
diff --git a/man/XChangeDeviceDontPropagateList.man b/man/XChangeDeviceDontPropagateList.man
index 2207077..f32ad50 100644
--- a/man/XChangeDeviceDontPropagateList.man
+++ b/man/XChangeDeviceDontPropagateList.man
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XChProp.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XChangeDeviceDontPropagateList 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XChangeDeviceDontPropagateList __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XChangeDeviceDontPropagateList, XGetDeviceDontPropagateList \- query or change the dont-propagate-list for extension devices
 .SH SYNTAX
diff --git a/man/XChangeKeyboardDevice.man b/man/XChangeKeyboardDevice.man
index 523abbd..a164cea 100644
--- a/man/XChangeKeyboardDevice.man
+++ b/man/XChangeKeyboardDevice.man
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XChgKbd.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XChangeKeyboardDevice 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XChangeKeyboardDevice __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XChangeKeyboardDevice \- change which device is used as the X keyboard
 .SH SYNTAX
diff --git a/man/XChangePointerDevice.man b/man/XChangePointerDevice.man
index da0b37c..b02b462 100644
--- a/man/XChangePointerDevice.man
+++ b/man/XChangePointerDevice.man
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XChgPtr.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XChangePointerDevice 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XChangePointerDevice __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XChangePointerDevice \- change which device is the X pointer
 .SH SYNTAX
diff --git a/man/XDeviceBell.man b/man/XDeviceBell.man
index 30a89c7..8b25ab0 100644
--- a/man/XDeviceBell.man
+++ b/man/XDeviceBell.man
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XDevBell.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XDeviceBell 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XDeviceBell __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XDeviceBell \- ring a bell on a device supported through the input extension
 .SH SYNTAX
@@ -71,7 +71,7 @@ not been opened by this client via \fIXOpenInputDevice\fP.
 \fIBadValue\fP
 An invalid feedbackclass, feedbackid, or percent value was specified.
 .SH "SEE ALSO"
-XChangeFeedbackControl(3X),
-XBell(3X)
+XChangeFeedbackControl(3),
+XBell(3)
 .br
 \fI\*(xL\fP
diff --git a/man/XGetDeviceControl.man b/man/XGetDeviceControl.man
index e605b2d..5f55c49 100644
--- a/man/XGetDeviceControl.man
+++ b/man/XGetDeviceControl.man
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XChDCtl.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XGetDeviceControl 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XGetDeviceControl __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XGetDeviceControl, XChangeDeviceControl \- query and change input device controls
 .SH SYNTAX
diff --git a/man/XGetDeviceKeyMapping.man b/man/XGetDeviceKeyMapping.man
index 1eef30c..6f9ca5c 100644
--- a/man/XGetDeviceKeyMapping.man
+++ b/man/XGetDeviceKeyMapping.man
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XChKMap.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming with Xlib
-.TH XGetDeviceKeyMapping 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XGetDeviceKeyMapping __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XGetDeviceKeyMapping, XChangeDeviceKeyMapping \- query or change device key mappings
 .SH SYNTAX
@@ -173,8 +173,8 @@ alternatives can generate this error.
 \fIBadAlloc\fP
 The server failed to allocate the requested resource or server memory.
 .SH "SEE ALSO"
-XSetDeviceButtonMapping(3X11) 
+XSetDeviceButtonMapping(3) 
 .br
-XSetDeviceModifierMapping(3X11) 
+XSetDeviceModifierMapping(3) 
 .br
 \fI\*(xL\fP
diff --git a/man/XGetDeviceModifierMapping.man b/man/XGetDeviceModifierMapping.man
index 7de4fe1..5c5823b 100644
--- a/man/XGetDeviceModifierMapping.man
+++ b/man/XGetDeviceModifierMapping.man
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XChMMap.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XGetDeviceModifierMapping 3X11 __xorgversion__  "X FUNCTIONS"
+.TH XGetDeviceModifierMapping __LIB_MAN_SUFFIX__ __xorgversion__  "X FUNCTIONS"
 .SH NAME
 XGetDeviceModifierMapping, XSetDeviceModifierMapping \- query or change device modifier mappings
 .SH SYNTAX
@@ -138,8 +138,8 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XSetDeviceKeyMapping(3X11) 
+XSetDeviceKeyMapping(3) 
 .br
-XSetDeviceButtonMapping(3X11) 
+XSetDeviceButtonMapping(3) 
 .br
 \fI\*(xL\fP
diff --git a/man/XGetDeviceMotionEvents.man b/man/XGetDeviceMotionEvents.man
index 4b80fd9..4f18c70 100644
--- a/man/XGetDeviceMotionEvents.man
+++ b/man/XGetDeviceMotionEvents.man
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XGetDvMo.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming with Xlib
-.TH XGetDeviceMotionEvents 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XGetDeviceMotionEvents __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XGetDeviceMotionEvents, XDeviceTimeCoord \- get device motion history 
 .SH SYNTAX
diff --git a/man/XGetExtensionVersion.man b/man/XGetExtensionVersion.man
index 9d9768f..93c4621 100644
--- a/man/XGetExtensionVersion.man
+++ b/man/XGetExtensionVersion.man
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XGetExtV.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XGetExtensionVersion 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XGetExtensionVersion __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XGetExtensionVersion \- query the version of the input extension.
 .SH SYNTAX
diff --git a/man/XGetFeedbackControl.man b/man/XGetFeedbackControl.man
index 5de0c7a..4c29e17 100644
--- a/man/XGetFeedbackControl.man
+++ b/man/XGetFeedbackControl.man
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XChFCtl.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XGetFeedbackControl 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XGetFeedbackControl __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XGetFeedbackControl, XChangeFeedbackControl \- query and change input device feedbacks
 .SH SYNTAX
diff --git a/man/XGrabDevice.man b/man/XGrabDevice.man
index f8a922e..20cd3d4 100644
--- a/man/XGrabDevice.man
+++ b/man/XGrabDevice.man
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XGrabDev.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XGrabDevice 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XGrabDevice __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XGrabDevice, XUngrabDevice \- grab/release the specified extension device
 .SH SYNTAX
@@ -196,8 +196,8 @@ alternatives can generate this error.
 \fIBadWindow\fP
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllowDeviceEvents(3X),
-XGrabDeviceButton(3X),
-XGrabDeviceKey(3X),
+XAllowDeviceEvents(3),
+XGrabDeviceButton(3),
+XGrabDeviceKey(3),
 .br
 \fI\*(xL\fP
diff --git a/man/XGrabDeviceButton.man b/man/XGrabDeviceButton.man
index d85c06d..57e1f9e 100644
--- a/man/XGrabDeviceButton.man
+++ b/man/XGrabDeviceButton.man
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XGrDvBut.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XGrabDeviceButton 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XGrabDeviceButton __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XGrabDeviceButton, XUngrabDeviceButton \- grab/ungrab extension input device buttons
 .SH SYNTAX
@@ -202,10 +202,10 @@ alternatives can generate this error.
 \fIBadWindow\fP
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllowDeviceEvents(3X),
+XAllowDeviceEvents(3),
 .br
-XGrabDevice(3X),
+XGrabDevice(3),
 .br
-XGrabDeviceKey(3X),
+XGrabDeviceKey(3),
 .br
 \fI\*(xL\fP
diff --git a/man/XGrabDeviceKey.man b/man/XGrabDeviceKey.man
index 6170ba8..1284f37 100644
--- a/man/XGrabDeviceKey.man
+++ b/man/XGrabDeviceKey.man
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XGrDvKey.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming with Xlib
-.TH XGrabDeviceKey 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XGrabDeviceKey __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XGrabDeviceKey, XUngrabDeviceKey \- grab/ungrab extension input device Keys
 .SH SYNTAX
@@ -196,11 +196,11 @@ alternatives can generate this error.
 \fIBadWindow\fP
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllowDeviceEvents(3X),
+XAllowDeviceEvents(3),
 .br
-XGrabDevice(3X),
+XGrabDevice(3),
 .br
-XGrabDeviceButton(3X),
+XGrabDeviceButton(3),
 .br
 .br
 \fI\*(xL\fP
diff --git a/man/XListInputDevices.man b/man/XListInputDevices.man
index e0f06c5..9156fe2 100644
--- a/man/XListInputDevices.man
+++ b/man/XListInputDevices.man
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XListDev.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming with Xlib
-.TH XListInputDevices 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XListInputDevices __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XListInputDevices, XFreeDeviceList \- list available input devices
 .SH SYNTAX
diff --git a/man/XOpenDevice.man b/man/XOpenDevice.man
index 0dc1500..1ce1835 100644
--- a/man/XOpenDevice.man
+++ b/man/XOpenDevice.man
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XOpenDev.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming with Xlib
-.TH XOpenDevice 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XOpenDevice __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XOpenDevice, XCloseDevice \- open or close an extension input device
 .SH SYNTAX
diff --git a/man/XQueryDeviceState.man b/man/XQueryDeviceState.man
index f850216..2e238ff 100644
--- a/man/XQueryDeviceState.man
+++ b/man/XQueryDeviceState.man
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XQueryDv.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming with Xlib
-.TH XQueryDeviceState 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XQueryDeviceState __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XQueryDeviceState \- query the state of an extension input device.
 .SH SYNTAX
diff --git a/man/XSelectExtensionEvent.man b/man/XSelectExtensionEvent.man
index d394cf0..75a3d68 100644
--- a/man/XSelectExtensionEvent.man
+++ b/man/XSelectExtensionEvent.man
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XSelExtEv.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $
 .ds xL Programming with Xlib
-.TH XSelectExtensionEvent 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XSelectExtensionEvent __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XSelectExtensionEvent, XGetSelectedExtensionEvents \- select extension events, get the list of currently selected extension events
 .SH SYNTAX
diff --git a/man/XSendExtensionEvent.man b/man/XSendExtensionEvent.man
index 34fa904..a8ebd5b 100644
--- a/man/XSendExtensionEvent.man
+++ b/man/XSendExtensionEvent.man
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XSExEvnt.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $
 .ds xL Programming with Xlib
-.TH XSendExtensionEvent 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XSendExtensionEvent __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XSendExtensionEvent \- send input extension events to a client
 .SH SYNTAX
@@ -56,7 +56,7 @@ determines which clients should receive the specified events,
 and ignores any active grabs.
 This request requires you to pass an event class list.
 For a discussion of the valid event class names,
-see \fIXOpenDevice(3X11)\fP.
+see \fIXOpenDevice(3)\fP.
 This request uses the w argument to identify the destination window as follows:
 .IP \(bu 5
 If w is
diff --git a/man/XSetDeviceButtonMapping.man b/man/XSetDeviceButtonMapping.man
index 6e63b53..d1f6cf0 100644
--- a/man/XSetDeviceButtonMapping.man
+++ b/man/XSetDeviceButtonMapping.man
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XSeBMap.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $
 .ds xL Programming With Xlib
-.TH XSetDeviceButtonMapping 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XSetDeviceButtonMapping __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XSetDeviceButtonMapping, XGetDeviceButtonMapping \- query or change device button mappings
 .SH SYNTAX
@@ -92,11 +92,11 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XChangeDeviceKeyboardControl(3X),
+XChangeDeviceKeyboardControl(3),
 .br
-XChangeDeviceKeyMapping(3X)
+XChangeDeviceKeyMapping(3)
 .br
-XChangeDeviceModifierMapping(3X)
+XChangeDeviceModifierMapping(3)
 .br
 .br
 \fI\*(xL\fP
diff --git a/man/XSetDeviceFocus.man b/man/XSetDeviceFocus.man
index c313af3..ea37c9c 100644
--- a/man/XSetDeviceFocus.man
+++ b/man/XSetDeviceFocus.man
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XSeDvFoc.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $
 .ds xL Programming with Xlib
-.TH XSetDeviceFocus 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XSetDeviceFocus __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XSetDeviceFocus, XGetDeviceFocus \- control extension input device focus
 .SH SYNTAX
diff --git a/man/XSetDeviceMode.man b/man/XSetDeviceMode.man
index 5695948..41b871e 100644
--- a/man/XSetDeviceMode.man
+++ b/man/XSetDeviceMode.man
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XSetMode.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $
 .ds xL Programming with Xlib
-.TH XSetDeviceMode 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XSetDeviceMode __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XSetDeviceMode \- change the mode of a device
 .SH SYNTAX
diff --git a/man/XSetDeviceValuators.man b/man/XSetDeviceValuators.man
index b926e2d..886b864 100644
--- a/man/XSetDeviceValuators.man
+++ b/man/XSetDeviceValuators.man
@@ -13,7 +13,7 @@
 .\" 
 .\" $Xorg: XSetDVal.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $
 .ds xL Programming with Xlib
-.TH XSetDeviceValuators 3X11 __xorgversion__ "X FUNCTIONS"
+.TH XSetDeviceValuators __LIB_MAN_SUFFIX__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XSetDeviceValuators \- initialize the valuators on an extension input device
 .SH SYNTAX