Imported Upstream version 1.47.15upstream/1.47.15

26 files changed, 73 insertions, 61 deletions

diff --git a/README b/README
index 96e4c29..3816e9e 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-		README for GNU help2man version 1.47.14
+		README for GNU help2man version 1.47.15
 
 help2man is a script to create simple man pages from the --help and
 --version output of programs.
@@ -8,7 +8,7 @@ way to generate a placeholder man page pointing to that resource while
 still providing some useful information.
 
   Home page:    http://www.gnu.org/software/help2man/
-  Distribution: ftp://ftp.gnu.org/gnu/help2man/help2man-1.47.14.tar.xz
+  Distribution: ftp://ftp.gnu.org/gnu/help2man/help2man-1.47.15.tar.xz
   Repository:   https://salsa.debian.org/bod/help2man.git
 
 -- 
diff --git a/configure b/configure
index a8a5d7a..5ce8d1f 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GNU help2man 1.47.14.
+# Generated by GNU Autoconf 2.69 for GNU help2man 1.47.15.
 #
 # Report bugs to <bug-help2man@gnu.org>.
 #
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GNU help2man'
 PACKAGE_TARNAME='help2man'
-PACKAGE_VERSION='1.47.14'
-PACKAGE_STRING='GNU help2man 1.47.14'
+PACKAGE_VERSION='1.47.15'
+PACKAGE_STRING='GNU help2man 1.47.15'
 PACKAGE_BUGREPORT='bug-help2man@gnu.org'
 PACKAGE_URL='http://www.gnu.org/software/help2man/'
 
@@ -1211,7 +1211,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNU help2man 1.47.14 to adapt to many kinds of systems.
+\`configure' configures GNU help2man 1.47.15 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1273,7 +1273,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU help2man 1.47.14:";;
+     short | recursive ) echo "Configuration of GNU help2man 1.47.15:";;
    esac
   cat <<\_ACEOF
 
@@ -1360,7 +1360,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU help2man configure 1.47.14
+GNU help2man configure 1.47.15
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1461,7 +1461,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNU help2man $as_me 1.47.14, which was
+It was created by GNU help2man $as_me 1.47.15, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3777,7 +3777,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GNU help2man $as_me 1.47.14, which was
+This file was extended by GNU help2man $as_me 1.47.15, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3832,7 +3832,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-GNU help2man config.status 1.47.14
+GNU help2man config.status 1.47.15
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/debian/changelog b/debian/changelog
index 0c7725b..3b10e26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+help2man (1.47.15) unstable; urgency=medium
+
+  * Use the package name and version as the default for --source (was
+    program).
+  * Support packages in version strings without the GNU or Free prefix.
+  * Allow an optional second dash to separate the package name from the
+    version for multi-word packages: "program - package name - version".
+
+ -- Brendan O'Dea <bod@debian.org>  Mon, 27 Apr 2020 15:34:29 +1000
+
 help2man (1.47.14) unstable; urgency=medium
 
   * Revert --version parsing change from 1.47.13, which had unintended
diff --git a/help2man.1 b/help2man.1
index 31b64fb..0f2c55b 100644
--- a/help2man.1
+++ b/help2man.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.
-.TH HELP2MAN "1" "April 2020" "help2man 1.47.14" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.15.
+.TH HELP2MAN "1" "April 2020" "GNU help2man 1.47.15" "User Commands"
 .SH NAME
 help2man \- generate a simple manual page
 .SH SYNOPSIS
diff --git a/help2man.PL b/help2man.PL
index c55e7de..c5d35a9 100755
--- a/help2man.PL
+++ b/help2man.PL
@@ -16,7 +16,7 @@ use 5.008;
 use Config;
 use Getopt::Long;
 
-my ($program, $version) = ('help2man', '1.47.14');
+my ($program, $version) = ('help2man', '1.47.15');
 
 my %opts;
 die "Usage: $0 [--quiet] [--stdout] [--with-gettext] [--name] [--version]\n"
@@ -403,15 +403,17 @@ if ($opt_output)
 #   <version>
 #   <program> <version>
 #   {GNU,Free} <program> <version>
-#   <program> ({GNU,Free} <package>) <version>
-#   <program> - {GNU,Free} <package> <version>
+#   <program> ({GNU,Free,} <package>) <version>
+#   <program> - {GNU,Free,} <package> <version>
+#   <program> - {GNU,Free,} <package> - <version>
 #
 # and separated from any copyright/author details by a blank line.
 
 ($_, $version_text) = ((split /\n+/, $version_text, 2), '');
 
-if (/^(\S+) +\(((?:GNU|Free) +[^)]+)\) +(\S.*)$/ or
-    /^(\S+) +- +((?:GNU|Free) +\S+) +(\S.*)$/)
+if (/^(\S+) +\(((?:(?:GNU|Free) +)?[^)]+)\) +(\S.*)$/ or
+    /^(\S+) +- +((?:(?:GNU|Free) +)?\S.*) +- +(\S.*)$/ or
+    /^(\S+) +- +((?:(?:GNU|Free) +)?\S+) +(\S.*)$/)
 {
     $program = program_basename $1;
     $package = $2;
@@ -457,7 +459,7 @@ for ($replace{_('NAME')} || ($include{_('NAME')} ||= ''))
 my $PROGRAM = uc $program;
 
 # Set default page head/footers
-$source ||= "$program $version";
+$source ||= "$package $version";
 unless ($manual)
 {
     for ($section)
diff --git a/help2man.da.1 b/help2man.da.1
index dbb4870..7a4b7d0 100644
--- a/help2man.da.1
+++ b/help2man.da.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.
-.TH HELP2MAN "1" "april 2020" "help2man 1.47.14" "Brugerkommandoer"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.15.
+.TH HELP2MAN "1" "april 2020" "GNU help2man 1.47.15" "Brugerkommandoer"
 .SH NAVN
 help2man \- opret en simpel manualside
 .SH SYNOPSIS
diff --git a/help2man.de.1 b/help2man.de.1
index 8ee135f..314edd9 100644
--- a/help2man.de.1
+++ b/help2man.de.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.
-.TH HELP2MAN "1" "April 2020" "help2man 1.47.14" "Dienstprogramme für Benutzer"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.15.
+.TH HELP2MAN "1" "April 2020" "GNU help2man 1.47.15" "Dienstprogramme für Benutzer"
 .SH BEZEICHNUNG
 help2man \- generiert eine einfache Handbuchseite
 .SH ÜBERSICHT
diff --git a/help2man.el.1 b/help2man.el.1
index 5c4233e..5e86db5 100644
--- a/help2man.el.1
+++ b/help2man.el.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.
-.TH HELP2MAN "1" "Απριλίου 2020" "help2man 1.47.14" "Εντολές χρήστη"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.15.
+.TH HELP2MAN "1" "Απριλίου 2020" "GNU help2man 1.47.15" "Εντολές χρήστη"
 .SH NAME
 help2man \- δημιουργία απλής σελίδας εγχειριδίου
 .SH SYNOPSIS
diff --git a/help2man.eo.1 b/help2man.eo.1
index 758b559..fa7068d 100644
--- a/help2man.eo.1
+++ b/help2man.eo.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.
-.TH HELP2MAN "1" "2020-04" "help2man 1.47.14" "Uzant-komandoj"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.15.
+.TH HELP2MAN "1" "2020-04" "GNU help2man 1.47.15" "Uzant-komandoj"
 .SH NOMO
 help2man \- generas simplan man-paĝon
 .SH RESUMO
diff --git a/help2man.es.1 b/help2man.es.1
index 87530e2..4b1d47d 100644
--- a/help2man.es.1
+++ b/help2man.es.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.
-.TH HELP2MAN "1" "abril 2020" "help2man 1.47.14" "Órdenes de usuario"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.15.
+.TH HELP2MAN "1" "abril 2020" "GNU help2man 1.47.15" "Órdenes de usuario"
 .SH NOMBRE
 help2man \- genera una página de manual básica
 .SH SINOPSIS
diff --git a/help2man.fi.1 b/help2man.fi.1
index 253a589..cd3f5be 100644
--- a/help2man.fi.1
+++ b/help2man.fi.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.
-.TH HELP2MAN "1" "huhtikuu 2020" "help2man 1.47.14" "Käyttäjän sovellukset"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.15.
+.TH HELP2MAN "1" "huhtikuu 2020" "GNU help2man 1.47.15" "Käyttäjän sovellukset"
 .SH NIMI
 help2man \- luo yksinkertainen man-sivu
 .SH YLEISKATSAUS
diff --git a/help2man.fr.1 b/help2man.fr.1
index 4c234c8..0e7be9c 100644
--- a/help2man.fr.1
+++ b/help2man.fr.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.
-.TH HELP2MAN "1" "avril 2020" "help2man 1.47.14" "Commandes"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.15.
+.TH HELP2MAN "1" "avril 2020" "GNU help2man 1.47.15" "Commandes"
 .SH NOM
 help2man \- Créer une page de manuel sommaire
 .SH SYNOPSIS
diff --git a/help2man.hr.1 b/help2man.hr.1
index 5af2df2..d79f3c1 100644
--- a/help2man.hr.1
+++ b/help2man.hr.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.
-.TH HELP2MAN "1" "travnja 2020" "help2man 1.47.14" "Korisničke naredbe"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.15.
+.TH HELP2MAN "1" "travnja 2020" "GNU help2man 1.47.15" "Korisničke naredbe"
 .SH IME
 help2man \- napravi jednostavnu stranicu priručnika
 .SH PREGLED
diff --git a/help2man.hu.1 b/help2man.hu.1
index 3889f69..ac7e792 100644
--- a/help2man.hu.1
+++ b/help2man.hu.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.
-.TH HELP2MAN "1" "2020. április" "help2man 1.47.14" "Felhasználói parancsok"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.15.
+.TH HELP2MAN "1" "2020. április" "GNU help2man 1.47.15" "Felhasználói parancsok"
 .SH NÉV
 help2man \- egy egyszerű kézikönyvoldal előállítása
 .SH LEÍRÁS
diff --git a/help2man.it.1 b/help2man.it.1
index 4a60b31..6b5020b 100644
--- a/help2man.it.1
+++ b/help2man.it.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.
-.TH HELP2MAN "1" "aprile 2020" "help2man 1.47.14" "Comandi utente"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.15.
+.TH HELP2MAN "1" "aprile 2020" "GNU help2man 1.47.15" "Comandi utente"
 .SH NOME
 help2man \- genera una semplice pagina di manuale
 .SH SINTASSI
diff --git a/help2man.ja.1 b/help2man.ja.1
index 46189dc..be93a30 100644
--- a/help2man.ja.1
+++ b/help2man.ja.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.
-.TH HELP2MAN "1" "2020年4月" "help2man 1.47.14" "ユーザーコマンド"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.15.
+.TH HELP2MAN "1" "2020年4月" "GNU help2man 1.47.15" "ユーザーコマンド"
 .SH 名前
 help2man \- 簡易マニュアルページの生成
 .SH 書式
diff --git a/help2man.nb.1 b/help2man.nb.1
index 02c7c25..eb2abeb 100644
--- a/help2man.nb.1
+++ b/help2man.nb.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.
-.TH HELP2MAN "1" "april 2020" "help2man 1.47.14" "Brukerkommandoer"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.15.
+.TH HELP2MAN "1" "april 2020" "GNU help2man 1.47.15" "Brukerkommandoer"
 .SH NAVN
 help2man \- generer en enkel manualside
 .SH OVERSIKT
diff --git a/help2man.pl.1 b/help2man.pl.1
index b8952d7..00d42af 100644
--- a/help2man.pl.1
+++ b/help2man.pl.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.
-.TH HELP2MAN "1" "kwietnia 2020" "help2man 1.47.14" "Polecenia użytkownika"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.15.
+.TH HELP2MAN "1" "kwietnia 2020" "GNU help2man 1.47.15" "Polecenia użytkownika"
 .SH NAZWA
 help2man \- generowanie prostej strony podręcznika
 .SH SKŁADNIA
diff --git a/help2man.pt_BR.1 b/help2man.pt_BR.1
index 83fa413..50a2bfd 100644
--- a/help2man.pt_BR.1
+++ b/help2man.pt_BR.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.
-.TH HELP2MAN "1" "abril de 2020" "help2man 1.47.14" "Comandos de usuário"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.15.
+.TH HELP2MAN "1" "abril de 2020" "GNU help2man 1.47.15" "Comandos de usuário"
 .SH NOME
 help2man \- gera uma página de manual simples
 .SH SINOPSE
diff --git a/help2man.ru.1 b/help2man.ru.1
index 71c4ca9..94ddb5a 100644
--- a/help2man.ru.1
+++ b/help2man.ru.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.
-.TH HELP2MAN "1" "24.04.2020" "help2man 1.47.14" "Пользовательские команды"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.15.
+.TH HELP2MAN "1" "27.04.2020" "GNU help2man 1.47.15" "Пользовательские команды"
 .SH ИМЯ
 help2man \- генерирует простую справочную страницу
 .SH ОБЗОР
diff --git a/help2man.sr.1 b/help2man.sr.1
index 0aa2343..3e272fb 100644
--- a/help2man.sr.1
+++ b/help2man.sr.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.
-.TH ГНУ "1" "април 2020." "ГНУ help2man 1.47.14" "Корисничке наредбе"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.15.
+.TH ГНУ "1" "април 2020." "ГНУ help2man 1.47.15" "Корисничке наредбе"
 .SH НАЗИВ
 help2man \— ствара страницу упутства
 .SH УВОД
diff --git a/help2man.sv.1 b/help2man.sv.1
index 1fbdd52..2c56f35 100644
--- a/help2man.sv.1
+++ b/help2man.sv.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.
-.TH HELP2MAN "1" "april 2020" "help2man 1.47.14" "Användarkommandon"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.15.
+.TH HELP2MAN "1" "april 2020" "GNU help2man 1.47.15" "Användarkommandon"
 .SH NAMN
 help2man \- generera en enkel manualsida
 .SH SYNOPSIS
diff --git a/help2man.ta.1 b/help2man.ta.1
index 3bf09bf..45e0e75 100644
--- a/help2man.ta.1
+++ b/help2man.ta.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.
-.TH HELP2MAN "1" "ஏப்ரல் 2020" "help2man 1.47.14" "பயனர்க் கட்டளைகள்"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.15.
+.TH HELP2MAN "1" "ஏப்ரல் 2020" "GNU help2man 1.47.15" "பயனர்க் கட்டளைகள்"
 .SH பெயர்
 help2man \- எளிய கையேட்டுப் பக்கத்தை உருவாக்கு
 .SH விளக்கம்
diff --git a/help2man.uk.1 b/help2man.uk.1
index 3d3725f..1dd10e9 100644
--- a/help2man.uk.1
+++ b/help2man.uk.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.
-.TH HELP2MAN "1" "24.04.20" "help2man 1.47.14" "Команди користувача"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.15.
+.TH HELP2MAN "1" "27.04.20" "GNU help2man 1.47.15" "Команди користувача"
 .SH НАЗВА
 help2man \— програма для створення простих сторінок довідника
 .SH "КОРОТКИЙ ОПИС"
diff --git a/help2man.vi.1 b/help2man.vi.1
index 906aa5f..977e3cb 100644
--- a/help2man.vi.1
+++ b/help2man.vi.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.
-.TH HELP2MAN "1" "Tháng 4 2020" "help2man 1.47.14" "Các câu lệnh"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.15.
+.TH HELP2MAN "1" "Tháng 4 2020" "GNU help2man 1.47.15" "Các câu lệnh"
 .SH TÊN
 help2man \- tạo một trang hướng dẫn dạng man kiểu đơn giản
 .SH "TÓM TẮT"
diff --git a/help2man.zh_CN.1 b/help2man.zh_CN.1
index 7e38fe0..5fe1432 100644
--- a/help2man.zh_CN.1
+++ b/help2man.zh_CN.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.
-.TH HELP2MAN "1" "2020 四月" "help2man 1.47.14" "用户命令"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.15.
+.TH HELP2MAN "1" "2020 四月" "GNU help2man 1.47.15" "用户命令"
 .SH 名称
 help2man \- 输出一份简单的手册页
 .SH 描述