X Strike Force X.Org X11 SVN commit: r3970 - in trunk/app/xterm/debian: . local patches
Author: julien
Date: 2006-11-07 23:29:13 -0500 (Tue, 07 Nov 2006)
New Revision: 3970
Added:
trunk/app/xterm/debian/local/koi8rxterm.1
trunk/app/xterm/debian/local/lxterm.1
trunk/app/xterm/debian/local/uxterm.1
Removed:
trunk/app/xterm/debian/local/koi8rxterm.1x
trunk/app/xterm/debian/local/lxterm.1x
trunk/app/xterm/debian/local/uxterm.1x
Modified:
trunk/app/xterm/debian/changelog
trunk/app/xterm/debian/patches/901_xterm_manpage.diff
trunk/app/xterm/debian/rules
trunk/app/xterm/debian/xterm.postinst
Log:
* Install all manpages with "1" as extension instead of "1x". Also use
the x-terminal-emulator.1.gz slave alternative, instead of
x-terminal-emulator.1x.gz. We also need to clean up the mess this wrong
path caused, and make sure that the x-terminal-emulator.1.gz link in
/usr/share/man/man1/ is still there. If it disappeared, we add it in
postinst. Thanks to Vincent Lefevre and Joey Hess (closes: #349462).
Modified: trunk/app/xterm/debian/changelog
===================================================================
--- trunk/app/xterm/debian/changelog 2006-11-08 03:44:37 UTC (rev 3969)
+++ trunk/app/xterm/debian/changelog 2006-11-08 04:29:13 UTC (rev 3970)
@@ -1,3 +1,14 @@
+xterm (222-2) unstable; urgency=low
+
+ * Install all manpages with "1" as extension instead of "1x". Also use
+ the x-terminal-emulator.1.gz slave alternative, instead of
+ x-terminal-emulator.1x.gz. We also need to clean up the mess this wrong
+ path caused, and make sure that the x-terminal-emulator.1.gz link in
+ /usr/share/man/man1/ is still there. If it disappeared, we add it in
+ postinst. Thanks to Vincent Lefevre and Joey Hess (closes: #349462).
+
+ -- Julien Cristau <julien.cristau@ens-lyon.org> Wed, 8 Nov 2006 05:12:34 +0100
+
xterm (222-1) unstable; urgency=low
* New upstream release
Copied: trunk/app/xterm/debian/local/koi8rxterm.1 (from rev 3965, trunk/app/xterm/debian/local/koi8rxterm.1x)
===================================================================
--- trunk/app/xterm/debian/local/koi8rxterm.1 (rev 0)
+++ trunk/app/xterm/debian/local/koi8rxterm.1 2006-11-08 04:29:13 UTC (rev 3970)
@@ -0,0 +1,97 @@
+.\" $Id: koi8rxterm.1x 180 2005-06-10 20:54:37Z branden $
+.\"
+.\" Copyright 2004 Branden Robinson
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining a
+.\" copy of this software and associated documentation files (the "Software"),
+.\" to deal in the Software without restriction, including without limitation
+.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
+.\" and/or sell copies of the Software, and to permit persons to whom the
+.\" Software is furnished to do so, subject to the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included in
+.\" all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+.\" SOFTWARE IN THE PUBLIC INTEREST, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR
+.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+.\" DEALINGS IN THE SOFTWARE.
+.TH koi8rxterm 1 "2004-12-19" "Debian Project"
+.SH NAME
+koi8rxterm \- X terminal emulator for KOI8-R environments
+.SH SYNOPSIS
+.B koi8rxterm
+[
+.I xterm-options
+]
+.SH DESCRIPTION
+.B koi8rxterm
+is a wrapper around the
+.BR xterm (1)
+program that invokes the latter program with the \(oqKOI8RXTerm\(cq X
+resource class set.
+All arguments to
+.B koi8rxterm
+are passed to
+.B xterm
+without processing; the
+.B \-class
+and
+.B \-k8
+options should not be specified because they are used by the wrapper.
+See the
+.BR xterm
+manual page for more information on
+.IR xterm-options .
+.PP
+The environment's locale settings (see \(lqENVIRONMENT\(rq below) are
+used to discern the locale's character set.
+If no current locale can be determined, the locale \(oqru_RU.KOI8-R\(cq
+(the Russian language as used in the territory of Russia, with the KOI8-R
+character set) is assumed.
+The
+.BR locale (1)
+utility is used to determine whether the system supports the selected
+locale.
+If it does not,
+.B koi8rxterm
+will exit with an error and report the output of
+.BR locale .
+.PP
+.B Note: koi8rxterm
+may produce unexpected results if the current locale is set to one in which
+the KOI8-R character encoding is not supported, or if fonts using that
+encoding are not available.
+In the Debian system, the \(oqxfonts\-cyrillic\(cq package provides the
+fonts that
+.B koi8rxterm
+uses by default.
+To change the fonts
+.B koi8rxterm
+uses, edit the
+.I /etc/X11/app\-defaults/KOI8RXTerm
+file.
+.PP
+A similar wrapper,
+.BR uxterm (1),
+is available for Unicode UTF-8 environments.
+.SH ENVIRONMENT
+.TP
+.B LC_ALL\fR, \fBLC_CTYPE\fR, \fBLANG
+The values of these variables are checked, in order, to determine the
+character set used by the current locale.
+.SH AUTHOR
+.B koi8rxterm
+was written by Branden Robinson and is very heavily based on
+.BR uxterm ,
+by Thomas Dickey.
+The assistance of Jurij Smakov was invaluable in sanity-checking its
+operation.
+.SH "SEE ALSO"
+.BR locale (1),
+.BR locale (7),
+.BR uxterm (1),
+.BR xterm (1)
Deleted: trunk/app/xterm/debian/local/koi8rxterm.1x
===================================================================
--- trunk/app/xterm/debian/local/koi8rxterm.1x 2006-11-08 03:44:37 UTC (rev 3969)
+++ trunk/app/xterm/debian/local/koi8rxterm.1x 2006-11-08 04:29:13 UTC (rev 3970)
@@ -1,97 +0,0 @@
-.\" $Id: koi8rxterm.1x 180 2005-06-10 20:54:37Z branden $
-.\"
-.\" Copyright 2004 Branden Robinson
-.\"
-.\" Permission is hereby granted, free of charge, to any person obtaining a
-.\" copy of this software and associated documentation files (the "Software"),
-.\" to deal in the Software without restriction, including without limitation
-.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
-.\" and/or sell copies of the Software, and to permit persons to whom the
-.\" Software is furnished to do so, subject to the following conditions:
-.\"
-.\" The above copyright notice and this permission notice shall be included in
-.\" all copies or substantial portions of the Software.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-.\" SOFTWARE IN THE PUBLIC INTEREST, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR
-.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-.\" DEALINGS IN THE SOFTWARE.
-.TH koi8rxterm 1x "2004-12-19" "Debian Project"
-.SH NAME
-koi8rxterm \- X terminal emulator for KOI8-R environments
-.SH SYNOPSIS
-.B koi8rxterm
-[
-.I xterm-options
-]
-.SH DESCRIPTION
-.B koi8rxterm
-is a wrapper around the
-.BR xterm (1)
-program that invokes the latter program with the \(oqKOI8RXTerm\(cq X
-resource class set.
-All arguments to
-.B koi8rxterm
-are passed to
-.B xterm
-without processing; the
-.B \-class
-and
-.B \-k8
-options should not be specified because they are used by the wrapper.
-See the
-.BR xterm
-manual page for more information on
-.IR xterm-options .
-.PP
-The environment's locale settings (see \(lqENVIRONMENT\(rq below) are
-used to discern the locale's character set.
-If no current locale can be determined, the locale \(oqru_RU.KOI8-R\(cq
-(the Russian language as used in the territory of Russia, with the KOI8-R
-character set) is assumed.
-The
-.BR locale (1)
-utility is used to determine whether the system supports the selected
-locale.
-If it does not,
-.B koi8rxterm
-will exit with an error and report the output of
-.BR locale .
-.PP
-.B Note: koi8rxterm
-may produce unexpected results if the current locale is set to one in which
-the KOI8-R character encoding is not supported, or if fonts using that
-encoding are not available.
-In the Debian system, the \(oqxfonts\-cyrillic\(cq package provides the
-fonts that
-.B koi8rxterm
-uses by default.
-To change the fonts
-.B koi8rxterm
-uses, edit the
-.I /etc/X11/app\-defaults/KOI8RXTerm
-file.
-.PP
-A similar wrapper,
-.BR uxterm (1x),
-is available for Unicode UTF-8 environments.
-.SH ENVIRONMENT
-.TP
-.B LC_ALL\fR, \fBLC_CTYPE\fR, \fBLANG
-The values of these variables are checked, in order, to determine the
-character set used by the current locale.
-.SH AUTHOR
-.B koi8rxterm
-was written by Branden Robinson and is very heavily based on
-.BR uxterm ,
-by Thomas Dickey.
-The assistance of Jurij Smakov was invaluable in sanity-checking its
-operation.
-.SH "SEE ALSO"
-.BR locale (1),
-.BR locale (7),
-.BR uxterm (1x),
-.BR xterm (1)
Copied: trunk/app/xterm/debian/local/lxterm.1 (from rev 3965, trunk/app/xterm/debian/local/lxterm.1x)
===================================================================
--- trunk/app/xterm/debian/local/lxterm.1 (rev 0)
+++ trunk/app/xterm/debian/local/lxterm.1 2006-11-08 04:29:13 UTC (rev 3970)
@@ -0,0 +1,55 @@
+.\" $Id: lxterm.1x 189 2005-06-11 00:04:27Z branden $
+.\"
+.TH lxterm 1 "2004-12-19" "Debian Project"
+.SH NAME
+lxterm \- locale\-sensitive wrapper for xterm
+.SH SYNOPSIS
+.B lxterm
+[
+.I xterm-options
+]
+.SH DESCRIPTION
+.B lxterm
+is a wrapper around the
+.BR xterm (1)
+program that invokes
+.BR xterm ,
+.BR koi8rxterm (1),
+or
+.BR uxterm (1)
+as appropriate, based on the user's locale setting.
+All arguments to
+.B lxterm
+are passed to
+.B xterm
+without processing; the
+.BR \-class ,
+.BR \-k8 ,
+and
+.B \-u8
+options should not be specified because they are used by
+.B koi8rxterm
+and
+.BR uxterm .
+See the
+.B xterm
+manual page for more information on
+.IR xterm-options .
+.PP
+The
+.BR locale (1)
+utility is used to determine the character set used by the current locale.
+If the character set is UTF-8,
+.B uxterm
+is invoked; if the character set is KOI8-R,
+.B koi8rxtem
+is invoked; otherwise, \(oqplain\(cq
+.B xterm
+is invoked.
+.SH AUTHOR
+Branden Robinson
+.SH "SEE ALSO"
+.BR locale (1),
+.BR koi8rxterm (1),
+.BR uxterm (1),
+.BR xterm (1)
Deleted: trunk/app/xterm/debian/local/lxterm.1x
===================================================================
--- trunk/app/xterm/debian/local/lxterm.1x 2006-11-08 03:44:37 UTC (rev 3969)
+++ trunk/app/xterm/debian/local/lxterm.1x 2006-11-08 04:29:13 UTC (rev 3970)
@@ -1,55 +0,0 @@
-.\" $Id: lxterm.1x 189 2005-06-11 00:04:27Z branden $
-.\"
-.TH lxterm 1x "2004-12-19" "Debian Project"
-.SH NAME
-lxterm \- locale\-sensitive wrapper for xterm
-.SH SYNOPSIS
-.B lxterm
-[
-.I xterm-options
-]
-.SH DESCRIPTION
-.B lxterm
-is a wrapper around the
-.BR xterm (1)
-program that invokes
-.BR xterm ,
-.BR koi8rxterm (1x),
-or
-.BR uxterm (1x)
-as appropriate, based on the user's locale setting.
-All arguments to
-.B lxterm
-are passed to
-.B xterm
-without processing; the
-.BR \-class ,
-.BR \-k8 ,
-and
-.B \-u8
-options should not be specified because they are used by
-.B koi8rxterm
-and
-.BR uxterm .
-See the
-.B xterm
-manual page for more information on
-.IR xterm-options .
-.PP
-The
-.BR locale (1)
-utility is used to determine the character set used by the current locale.
-If the character set is UTF-8,
-.B uxterm
-is invoked; if the character set is KOI8-R,
-.B koi8rxtem
-is invoked; otherwise, \(oqplain\(cq
-.B xterm
-is invoked.
-.SH AUTHOR
-Branden Robinson
-.SH "SEE ALSO"
-.BR locale (1),
-.BR koi8rxterm (1x),
-.BR uxterm (1x),
-.BR xterm (1)
Copied: trunk/app/xterm/debian/local/uxterm.1 (from rev 3965, trunk/app/xterm/debian/local/uxterm.1x)
===================================================================
--- trunk/app/xterm/debian/local/uxterm.1 (rev 0)
+++ trunk/app/xterm/debian/local/uxterm.1 2006-11-08 04:29:13 UTC (rev 3970)
@@ -0,0 +1,91 @@
+.\" $Id: uxterm.1x 180 2005-06-10 20:54:37Z branden $
+.\"
+.\" Copyright 2001, 2004 Branden Robinson
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining a
+.\" copy of this software and associated documentation files (the "Software"),
+.\" to deal in the Software without restriction, including without limitation
+.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
+.\" and/or sell copies of the Software, and to permit persons to whom the
+.\" Software is furnished to do so, subject to the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included in
+.\" all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+.\" SOFTWARE IN THE PUBLIC INTEREST, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR
+.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+.\" DEALINGS IN THE SOFTWARE.
+.TH uxterm 1 "2004-12-19" "Debian Project"
+.SH NAME
+uxterm \- X terminal emulator for for Unicode (UTF-8) environments
+.SH SYNOPSIS
+.B uxterm
+[
+.I xterm-options
+]
+.SH DESCRIPTION
+.B uxterm
+is a wrapper around the
+.BR xterm (1)
+program that invokes the latter program with the \(oqUXTerm\(cq X resource
+class set.
+All arguments to
+.B uxterm
+are passed to
+.B xterm
+without processing; the
+.B \-class
+and
+.B \-u8
+options should not be specified because they are used by the wrapper.
+See the
+.B xterm
+manual page for more information on
+.IR xterm-options .
+.PP
+The environment's locale settings (see \(lqENVIRONMENT\(rq below) are
+used to discern the locale's character set.
+If no current locale can be determined, the locale \(oqen_US\(cq (the
+English language as used in the territory of the United States) is assumed.
+The
+.BR locale (1)
+utility is used to determine whether the system supports the selected
+locale.
+If it does not,
+.B uxterm
+will exit with an error and report the output of
+.BR locale .
+.PP
+.B Note: uxterm
+may produce unexpected results if the current locale is set to one in which
+the UTF-8 character encoding is not supported, of if fonts using the ISO
+10646-1 character set are not available.
+In the Debian system, the \(oqxfonts\-base\(cq package provides the fonts
+that
+.B uxterm
+uses by default.
+To change the fonts
+.B uxterm
+uses, edit the
+.I /etc/X11/app\-defaults/UXTerm
+file.
+.PP
+A similar wrapper,
+.BR koi8rxterm (1),
+is available for KOI8-R environments.
+.SH ENVIRONMENT
+.TP
+.B LC_ALL\fR, \fBLC_CTYPE\fR, \fBLANG
+The values of these variables are checked, in order, to determine the
+character set used by the current locale.
+.SH AUTHOR
+Thomas Dickey
+.SH "SEE ALSO"
+.BR locale (1),
+.BR locale (7),
+.BR koi8rxterm (1),
+.BR xterm (1)
Deleted: trunk/app/xterm/debian/local/uxterm.1x
===================================================================
--- trunk/app/xterm/debian/local/uxterm.1x 2006-11-08 03:44:37 UTC (rev 3969)
+++ trunk/app/xterm/debian/local/uxterm.1x 2006-11-08 04:29:13 UTC (rev 3970)
@@ -1,91 +0,0 @@
-.\" $Id: uxterm.1x 180 2005-06-10 20:54:37Z branden $
-.\"
-.\" Copyright 2001, 2004 Branden Robinson
-.\"
-.\" Permission is hereby granted, free of charge, to any person obtaining a
-.\" copy of this software and associated documentation files (the "Software"),
-.\" to deal in the Software without restriction, including without limitation
-.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
-.\" and/or sell copies of the Software, and to permit persons to whom the
-.\" Software is furnished to do so, subject to the following conditions:
-.\"
-.\" The above copyright notice and this permission notice shall be included in
-.\" all copies or substantial portions of the Software.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-.\" SOFTWARE IN THE PUBLIC INTEREST, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR
-.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-.\" DEALINGS IN THE SOFTWARE.
-.TH uxterm 1x "2004-12-19" "Debian Project"
-.SH NAME
-uxterm \- X terminal emulator for for Unicode (UTF-8) environments
-.SH SYNOPSIS
-.B uxterm
-[
-.I xterm-options
-]
-.SH DESCRIPTION
-.B uxterm
-is a wrapper around the
-.BR xterm (1)
-program that invokes the latter program with the \(oqUXTerm\(cq X resource
-class set.
-All arguments to
-.B uxterm
-are passed to
-.B xterm
-without processing; the
-.B \-class
-and
-.B \-u8
-options should not be specified because they are used by the wrapper.
-See the
-.B xterm
-manual page for more information on
-.IR xterm-options .
-.PP
-The environment's locale settings (see \(lqENVIRONMENT\(rq below) are
-used to discern the locale's character set.
-If no current locale can be determined, the locale \(oqen_US\(cq (the
-English language as used in the territory of the United States) is assumed.
-The
-.BR locale (1)
-utility is used to determine whether the system supports the selected
-locale.
-If it does not,
-.B uxterm
-will exit with an error and report the output of
-.BR locale .
-.PP
-.B Note: uxterm
-may produce unexpected results if the current locale is set to one in which
-the UTF-8 character encoding is not supported, of if fonts using the ISO
-10646-1 character set are not available.
-In the Debian system, the \(oqxfonts\-base\(cq package provides the fonts
-that
-.B uxterm
-uses by default.
-To change the fonts
-.B uxterm
-uses, edit the
-.I /etc/X11/app\-defaults/UXTerm
-file.
-.PP
-A similar wrapper,
-.BR koi8rxterm (1x),
-is available for KOI8-R environments.
-.SH ENVIRONMENT
-.TP
-.B LC_ALL\fR, \fBLC_CTYPE\fR, \fBLANG
-The values of these variables are checked, in order, to determine the
-character set used by the current locale.
-.SH AUTHOR
-Thomas Dickey
-.SH "SEE ALSO"
-.BR locale (1),
-.BR locale (7),
-.BR koi8rxterm (1x),
-.BR xterm (1)
Modified: trunk/app/xterm/debian/patches/901_xterm_manpage.diff
===================================================================
--- trunk/app/xterm/debian/patches/901_xterm_manpage.diff 2006-11-08 03:44:37 UTC (rev 3969)
+++ trunk/app/xterm/debian/patches/901_xterm_manpage.diff 2006-11-08 04:29:13 UTC (rev 3970)
@@ -2,7 +2,6 @@
Make Debian-specific tweaks to xterm manpage:
* Use FHS paths to the utmp and wtmp files in xterm's manpage.
-* Correct section in the .TH header in order to clear a lintian warning.
This patch by Branden Robinson and David Martínez.
@@ -10,15 +9,6 @@
===================================================================
--- xterm.man.orig 2006-10-23 22:34:32.000000000 +0200
+++ xterm.man 2006-10-23 23:57:04.000000000 +0200
-@@ -69,7 +69,7 @@
- .sp
- .in -4
- ..
--.TH XTERM 1 __vendorversion__
-+.TH XTERM 1x __vendorversion__
- .SH NAME
- xterm \- terminal emulator for X
- .SH SYNOPSIS
@@ -4368,10 +4368,10 @@
.SH FILES
The actual pathnames given may differ on your system.
Modified: trunk/app/xterm/debian/rules
===================================================================
--- trunk/app/xterm/debian/rules 2006-11-08 03:44:37 UTC (rev 3969)
+++ trunk/app/xterm/debian/rules 2006-11-08 04:29:13 UTC (rev 3970)
@@ -116,18 +116,18 @@
dh_clean -k
dh_installdirs
# General installation
- $(MAKE) install mandir=/usr/share/man/man1 libdir=/etc manext=1x DESTDIR=$(DEBINSTALLTREE)
+ $(MAKE) install mandir=/usr/share/man/man1 libdir=/etc DESTDIR=$(DEBINSTALLTREE)
## Install lxterm command and manual page.
install -m 755 debian/local/lxterm $(DEBINSTALLTREE)/usr/bin
- install -m 755 debian/local/lxterm.1x $(DEBINSTALLTREE)/usr/share/man/man1
+ install -m 755 debian/local/lxterm.1 $(DEBINSTALLTREE)/usr/share/man/man1
## Install koi8rxterm command, manual page, and app-defaults file.
install -m 755 debian/local/koi8rxterm $(DEBINSTALLTREE)/usr/bin
- install -m 755 debian/local/koi8rxterm.1x $(DEBINSTALLTREE)/usr/share/man/man1
+ install -m 755 debian/local/koi8rxterm.1 $(DEBINSTALLTREE)/usr/share/man/man1
install -d $(DEBINSTALLTREE)/etc/X11/app-defaults
install -m 644 debian/local/KOI8RXTerm $(DEBINSTALLTREE)/etc/X11/app-defaults
## Install manual page for uxterm.
- install -m 644 debian/local/uxterm.1x $(DEBINSTALLTREE)/usr/share/man/man1
+ install -m 644 debian/local/uxterm.1 $(DEBINSTALLTREE)/usr/share/man/man1
## Install terminfo and termcap precompiled definitions.
install -d $(DEBINSTALLTREE)/usr/lib
install -m 644 termcap $(DEBINSTALLTREE)/usr/lib/xterm.termcap
Modified: trunk/app/xterm/debian/xterm.postinst
===================================================================
--- trunk/app/xterm/debian/xterm.postinst 2006-11-08 03:44:37 UTC (rev 3969)
+++ trunk/app/xterm/debian/xterm.postinst 2006-11-08 04:29:13 UTC (rev 3970)
@@ -14,24 +14,33 @@
update-alternatives --install /usr/bin/x-terminal-emulator \
x-terminal-emulator /usr/bin/xterm 20 --slave \
- /usr/share/man/man1/x-terminal-emulator.1x.gz x-terminal-emulator.1x.gz \
- /usr/share/man/man1/xterm.1x.gz
+ /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \
+ /usr/share/man/man1/xterm.1.gz
update-alternatives --install /usr/bin/x-terminal-emulator \
x-terminal-emulator /usr/bin/uxterm 20 --slave \
- /usr/share/man/man1/x-terminal-emulator.1x.gz x-terminal-emulator.1x.gz \
- /usr/share/man/man1/uxterm.1x.gz
+ /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \
+ /usr/share/man/man1/uxterm.1.gz
update-alternatives --install /usr/bin/x-terminal-emulator \
x-terminal-emulator /usr/bin/koi8rxterm 20 --slave \
- /usr/share/man/man1/x-terminal-emulator.1x.gz x-terminal-emulator.1x.gz \
- /usr/share/man/man1/koi8rxterm.1x.gz
+ /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \
+ /usr/share/man/man1/koi8rxterm.1.gz
update-alternatives --install /usr/bin/x-terminal-emulator \
x-terminal-emulator /usr/bin/lxterm 30 --slave \
- /usr/share/man/man1/x-terminal-emulator.1x.gz x-terminal-emulator.1x.gz \
- /usr/share/man/man1/lxterm.1x.gz
+ /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \
+ /usr/share/man/man1/lxterm.1.gz
+# in xterm versions from 204-0pre1 to 222-1, the manpage alternative was
+# set incorrectly to x-terminal-emulator.1x.gz. In some cases, this can lead
+# to the absence of the x-terminal-emulator.1.gz symbolic link after the
+# upgrade, so we check for this situation and add it back if necessary.
+# This can be removed after the release of etch.
+if ! [ -L /usr/share/man/man1/x-terminal-emulator.1.gz ]; then
+ ln -s /etc/alternatives/x-terminal-emulator.1.gz /usr/share/man/man1
+fi
+
#DEBHELPER#
exit 0
Reply to: