Commit cedc562368f0722febad69449664d960bda26203
2023-01-21T15:08:38
help2man-1.35.2
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243
diff --git a/README b/README
index 0d6facb..4f136d7 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@ help2man is a script to create simple man pages from the --help and
--version output of programs.
http://www.gnu.org/software/help2man/
- ftp://ftp.gnu.org/gnu/help2man/help2man-1.35.1.tar.gz
+ ftp://ftp.gnu.org/gnu/help2man/help2man-1.35.2.tar.gz
Since most GNU documentation is now in info format, this provides a
way to generate a placeholder man page pointing to that resource while
diff --git a/THANKS b/THANKS
index 466c414..1bf7e40 100644
--- a/THANKS
+++ b/THANKS
@@ -17,8 +17,10 @@ Peter Moulder <reiter@netspace.net.au>
François Pinard <pinard@iro.umontreal.ca>
Richard Pixley <rpixley@zhone.com>
Andreas Schwab <schwab@ls5.informatik.uni-dortmund.de>
+suzukis <suzukis@cmpt.phys.tohoku.ac.jp>
Patrick Tullmann <tullmann@cs.utah.edu>
Maciej W. Rozyc <macro@ds2.pg.gda.pl>
+Tommi Vainikainen <thv+debian@iki.fi>
Christopher Yeoh <cyeoh@users.sourceforge.net>
Okuji Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
-suzukis <suzukis@cmpt.phys.tohoku.ac.jp>
+NIIBE Yutaka <gniibe@fsij.org>
diff --git a/debian/changelog b/debian/changelog
index 1ca4c73..a9cfac2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+help2man (1.35.2) unstable; urgency=low
+
+ * help2man.texi: spelling corrections (closes: #328671).
+ * debian/rules: configure --host on cross build (closes: #284701).
+ * debian/rules: set DH_COMPAT to 4.
+
+ -- Brendan O'Dea <bod@debian.org> Tue, 4 Oct 2005 22:14:26 +1000
+
help2man (1.35.1) unstable; urgency=low
* Set program name to the first word of NAME paragraph in --include
@@ -234,7 +242,7 @@ Thu Dec 10 12:50:10 1998 Brendan O'Dea <bod@compusol.com.au>
* help2man.PL: Experimental NLS version on main trunk (1.6-1.8)
pruned, rejoined branch 1.5.1.4 as 1.6
- Cleaned up version format and removed François' name from
+ Cleaned up version format and removed François' name from
the code (at his suggestion).
* README.in: (add) Description for help2man
diff --git a/debian/rules b/debian/rules
index 7cfb46f..7e6714f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,16 +4,23 @@
# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
# Some lines taken from debmake, by Christoph Lameter.
-SHELL=/bin/bash
-
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+export DH_COMPAT=4
+
+SHELL = /bin/bash
+DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+ CONFARGS = --host=$(DEB_HOST_GNU_TYPE)
+endif
build: build-stamp
build-stamp:
dh_testdir
./configure --prefix=/usr --mandir='$${prefix}/share/man' \
- --infodir='$${prefix}/share/info'
+ --infodir='$${prefix}/share/info' $(CONFARGS)
$(MAKE)
touch build-stamp
@@ -32,7 +39,7 @@ install-stamp: build-stamp
dh_testroot
dh_clean -k
dh_installdirs
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/help2man
touch install-stamp
# Build architecture-independent files here.
diff --git a/help2man.1 b/help2man.1
index 66d718e..08726d5 100644
--- a/help2man.1
+++ b/help2man.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
-.TH HELP2MAN "1" "November 2004" "help2man 1.35" "User Commands"
+.TH HELP2MAN "1" "October 2005" "help2man 1.35" "User Commands"
.SH NAME
help2man \- generate a simple manual page
.SH SYNOPSIS
diff --git a/help2man.fr.1 b/help2man.fr.1
index ba28aa2..46f8158 100644
--- a/help2man.fr.1
+++ b/help2man.fr.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
-.TH HELP2MAN "1" "novembre 2004" "help2man 1.35" "Commandes"
+.TH HELP2MAN "1" "octobre 2005" "help2man 1.35" "Commandes"
.SH NOM
help2man \- génčre une page de manuel sommaire
.SH SYNOPSIS
diff --git a/help2man.info b/help2man.info
index 2597c59..680bff4 100644
--- a/help2man.info
+++ b/help2man.info
@@ -42,7 +42,7 @@ File: help2man.info, Node: Top, Next: Overview, Up: (dir)
* Including text:: Including additional text in the output.
* --help recommendations:: Recommended formatting for --help output.
* Makefile usage:: Using `help2man' with `make'.
-* Localised man pages:: Producing native langauge manual pages.
+* Localised man pages:: Producing native language manual pages.
* Reports:: Reporting bugs or suggestions.
* Availability:: Obtaining `help2man'.
@@ -174,7 +174,7 @@ the official GNU standards relating to `--help' and man pages.
`--version'.
* A very brief explanation of what the program does, including
- default and/or typical behavior. For example, here is `cp''s:
+ default and/or typical behaviour. For example, here is `cp''s:
Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.
@@ -198,10 +198,10 @@ the official GNU standards relating to `--help' and man pages.
For programs that take many options, it may be desirable to split
the option list into sections such as `Global', `Output control',
or whatever makes sense in the particular case. It is usually
- best to alphabetize (by short option name first, then long) within
+ best to alphabetise (by short option name first, then long) within
each section, or the entire list if there are no sections.
- * Any useful additional information about program behavior, such as
+ * Any useful additional information about program behaviour, such as
influential environment variables, further explanation of options,
etc. For example, `cp' discusses `VERSION_CONTROL' and sparse
files.
@@ -303,7 +303,7 @@ included in the distribution without requiring the end-user to have
File: help2man.info, Node: Localised man pages, Next: Reports, Prev: Makefile usage, Up: Top
-6 Producing Native Langauge Manual Pages.
+6 Producing Native Language Manual Pages.
*****************************************
Manual pages may be produced for any locale supported by both the
@@ -380,11 +380,11 @@ Node: Top1112
Node: Overview1819
Node: Invoking help2man2526
Node: --help recommendations4697
-Node: Including text8113
-Node: Makefile usage9650
-Node: Localised man pages10589
-Ref: Localised man pages-Footnote-112389
-Node: Reports12503
-Node: Availability12961
+Node: Including text8115
+Node: Makefile usage9652
+Node: Localised man pages10591
+Ref: Localised man pages-Footnote-112391
+Node: Reports12505
+Node: Availability12963
End Tag Table
diff --git a/help2man.pl.1 b/help2man.pl.1
index 75cb275..3313fb0 100644
--- a/help2man.pl.1
+++ b/help2man.pl.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
-.TH HELP2MAN "1" "listopad 2004" "help2man 1.35" "Polecenia użytkownika"
+.TH HELP2MAN "1" "październik 2005" "help2man 1.35" "Polecenia użytkownika"
.SH NAZWA
help2man \- generowanie prostej strony podręcznika
.SH SKŁADNIA
diff --git a/help2man.texi b/help2man.texi
index e99b419..2c5aa21 100644
--- a/help2man.texi
+++ b/help2man.texi
@@ -3,7 +3,7 @@
@settitle @command{help2man} Reference Manual
@setchapternewpage on
@finalout
-@c $Id: help2man.texi,v 1.10 2004/11/23 13:30:17 bod Exp $
+@c $Id: help2man.texi,v 1.11 2005/10/04 10:14:09 bod Exp $
@dircategory GNU programming support
@direntry
@@ -78,7 +78,7 @@ and @samp{--version} output of other commands.
* Including text:: Including additional text in the output.
* --help recommendations:: Recommended formatting for --help output.
* Makefile usage:: Using @command{help2man} with @command{make}.
-* Localised man pages:: Producing native langauge manual pages.
+* Localised man pages:: Producing native language manual pages.
* Reports:: Reporting bugs or suggestions.
* Availability:: Obtaining @command{help2man}.
@end menu
@@ -216,7 +216,7 @@ is, with no directory stripping. This is in contrast to the canonical
@item
A very brief explanation of what the program does, including default
-and/or typical behavior. For example, here is @command{cp}'s:
+and/or typical behaviour. For example, here is @command{cp}'s:
@example
Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.
@@ -245,11 +245,11 @@ option only:
For programs that take many options, it may be desirable to split the
option list into sections such as `Global', `Output control', or
whatever makes sense in the particular case. It is usually best to
-alphabetize (by short option name first, then long) within each section,
+alphabetise (by short option name first, then long) within each section,
or the entire list if there are no sections.
@item
-Any useful additional information about program behavior, such as
+Any useful additional information about program behaviour, such as
influential environment variables, further explanation of options, etc.
For example, @command{cp} discusses @env{VERSION_CONTROL} and sparse
files.
@@ -363,7 +363,7 @@ AC_PATH_PROG(HELP2MAN, help2man, false // No help2man //)
for @command{autoconf} alone.
@node Localised man pages
-@chapter Producing Native Langauge Manual Pages.
+@chapter Producing Native Language Manual Pages.
Manual pages may be produced for any locale supported by both the
program and @command{help2man}@footnote{@command{help2man} currently