Imported Upstream version 1.47.10

diff --git a/README b/README
index 258b342..c6abe82 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-               README for GNU help2man version 1.47.9
+               README for GNU help2man version 1.47.10
 
 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.9.tar.xz
+  Distribution: ftp://ftp.gnu.org/gnu/help2man/help2man-1.47.10.tar.xz
   Repository:   https://salsa.debian.org/bod/help2man.git
 
 -- 

diff --git a/configure b/configure
index 9a5b60c..d50542f 100755 (executable)
--- 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.9.
+# Generated by GNU Autoconf 2.69 for GNU help2man 1.47.10.
 #
 # 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.9'
-PACKAGE_STRING='GNU help2man 1.47.9'
+PACKAGE_VERSION='1.47.10'
+PACKAGE_STRING='GNU help2man 1.47.10'
 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.9 to adapt to many kinds of systems.
+\`configure' configures GNU help2man 1.47.10 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.9:";;
+     short | recursive ) echo "Configuration of GNU help2man 1.47.10:";;
    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.9
+GNU help2man configure 1.47.10
 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.9, which was
+It was created by GNU help2man $as_me 1.47.10, 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.9, which was
+This file was extended by GNU help2man $as_me 1.47.10, 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.9
+GNU help2man config.status 1.47.10
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/debian/changelog b/debian/changelog
index 55341cc..74232a3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+help2man (1.47.10) unstable; urgency=medium
+
+  * Change maintainer sanity check in debian/rules to use the contents
+    of README rather than the mtime, which may be have been modified by
+    dpkg-source (closes: #925136).
+
+ -- Brendan O'Dea <bod@debian.org>  Sat, 23 Mar 2019 12:18:57 +1100
+
 help2man (1.47.9) unstable; urgency=medium
 
   * Add Tamil translation (thanks to Arun Isaac).

diff --git a/debian/rules b/debian/rules
index 1f0e1ea..d07af1d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -36,8 +36,7 @@ build-stamp:
        $(MAKE) help2man.h2m  # for examples
        touch build-stamp
 
-clean:
-       test README -nt help2man.PL  # maintainer sanity check
+clean: check-maint-prep  # maintainer sanity check
        dh_testdir
        dh_testroot
        [ ! -f Makefile ] || $(MAKE) distclean
@@ -53,6 +52,7 @@ install-stamp: build-stamp
        $(MAKE) install DESTDIR=$(CURDIR)/debian/help2man
        touch install-stamp
 
+binary: binary-indep binary-arch
 binary-arch: build install
        dh_testdir
        dh_testroot
@@ -72,9 +72,6 @@ binary-arch: build install
 
 binary-indep: build install
 
-source diff:
-       @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
 # Maintainer pre-release setup.  Intended to be run from a copy of the
 # contents of the git repository, excluding the .git subdir.  E.g. something
 # like this:
@@ -117,10 +114,17 @@ maint-prep:
        ./configure
        $(MAKE) update-po all distclean
 
+# Simple sanity check that the above rule has been run prior to release (a
+# dependency of the "clean" rule, which is the first thing run when building a
+# debian package).
+check-maint-prep:
+       test -x configure  # autoconf has been run
+       grep -qF 'help2man-$(DEB_VERSION).tar' README  # exists and up to date
+
 maint-clean: maint-prep
        ./configure
        $(MAKE) maintainer-clean
        rm -f README ChangeLog $(AM_DOC) $(addprefix build-aux/,$(AM_AUX))
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary maint-prep maint-clean
+.PHONY: build build-arch build-indep clean install binary binary-arch
+.PHONY: binary-indep maint-prep check-maint-prep maint-clean

diff --git a/help2man.1 b/help2man.1
index 4ce39cc..03c8cb6 100644 (file)
--- a/help2man.1
+++ b/help2man.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.9.
-.TH HELP2MAN "1" "March 2019" "help2man 1.47.9" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
+.TH HELP2MAN "1" "March 2019" "help2man 1.47.10" "User Commands"
 .SH NAME
 help2man \- generate a simple manual page
 .SH SYNOPSIS

diff --git a/help2man.PL b/help2man.PL
index 336f4a3..8c27c87 100755 (executable)
--- a/help2man.PL
+++ b/help2man.PL
@@ -16,7 +16,7 @@ use 5.008;
 use Config;
 use Getopt::Long;
 
-my ($program, $version) = ('help2man', '1.47.9');
+my ($program, $version) = ('help2man', '1.47.10');
 
 my %opts;
 die "Usage: $0 [--quiet] [--stdout] [--with-gettext] [--name] [--version]\n"

diff --git a/help2man.da.1 b/help2man.da.1
index 72f0e20..2a62443 100644 (file)
--- a/help2man.da.1
+++ b/help2man.da.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.9.
-.TH HELP2MAN "1" "marts 2019" "help2man 1.47.9" "Brugerkommandoer"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
+.TH HELP2MAN "1" "marts 2019" "help2man 1.47.10" "Brugerkommandoer"
 .SH NAVN
 help2man \- opret en simpel manualside
 .SH SYNOPSIS

diff --git a/help2man.de.1 b/help2man.de.1
index 3d1d99d..7cb2bfe 100644 (file)
--- a/help2man.de.1
+++ b/help2man.de.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.9.
-.TH HELP2MAN "1" "März 2019" "help2man 1.47.9" "Dienstprogramme für Benutzer"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
+.TH HELP2MAN "1" "März 2019" "help2man 1.47.10" "Dienstprogramme für Benutzer"
 .SH BEZEICHNUNG
 help2man \- generiert eine einfache Handbuchseite
 .SH ÜBERSICHT

diff --git a/help2man.el.1 b/help2man.el.1
index de846a5..9ff697b 100644 (file)
--- a/help2man.el.1
+++ b/help2man.el.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.9.
-.TH HELP2MAN "1" "Μαρτίου 2019" "help2man 1.47.9" "Εντολές χρήστη"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
+.TH HELP2MAN "1" "Μαρτίου 2019" "help2man 1.47.10" "Εντολές χρήστη"
 .SH NAME
 help2man \- δημιουργία απλής σελίδας εγχειριδίου
 .SH SYNOPSIS

diff --git a/help2man.eo.1 b/help2man.eo.1
index 92f282b..b2b8ad7 100644 (file)
--- a/help2man.eo.1
+++ b/help2man.eo.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.9.
-.TH HELP2MAN "1" "2019-03" "help2man 1.47.9" "Uzant-komandoj"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
+.TH HELP2MAN "1" "2019-03" "help2man 1.47.10" "Uzant-komandoj"
 .SH NOMO
 help2man \- generas simplan man-paĝon
 .SH RESUMO

diff --git a/help2man.es.1 b/help2man.es.1
index c10dda2..a79e9c5 100644 (file)
--- a/help2man.es.1
+++ b/help2man.es.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.9.
-.TH HELP2MAN "1" "marzo 2019" "help2man 1.47.9" "Órdenes de usuario"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
+.TH HELP2MAN "1" "marzo 2019" "help2man 1.47.10" "Ó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 99e1441..2a70882 100644 (file)
--- a/help2man.fi.1
+++ b/help2man.fi.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.9.
-.TH HELP2MAN "1" "maaliskuu 2019" "help2man 1.47.9" "Käyttäjän sovellukset"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
+.TH HELP2MAN "1" "maaliskuu 2019" "help2man 1.47.10" "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 ff6d20f..88b4a62 100644 (file)
--- a/help2man.fr.1
+++ b/help2man.fr.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.9.
-.TH HELP2MAN "1" "mars 2019" "help2man 1.47.9" "Commandes"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
+.TH HELP2MAN "1" "mars 2019" "help2man 1.47.10" "Commandes"
 .SH NOM
 help2man \- Créer une page de manuel sommaire
 .SH SYNOPSIS

diff --git a/help2man.hr.1 b/help2man.hr.1
index c35e390..ecf7746 100644 (file)
--- a/help2man.hr.1
+++ b/help2man.hr.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.9.
-.TH HELP2MAN "1" "ožujka 2019" "help2man 1.47.9" "Korisničke naredbe"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
+.TH HELP2MAN "1" "ožujka 2019" "help2man 1.47.10" "Korisničke naredbe"
 .SH IME
 help2man \- napravi jednostavnu stranicu priručnika
 .SH PREGLED

diff --git a/help2man.hu.1 b/help2man.hu.1
index 7b369b9..9e1c270 100644 (file)
--- a/help2man.hu.1
+++ b/help2man.hu.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.9.
-.TH HELP2MAN "1" "2019. március" "help2man 1.47.9" "Felhasználói parancsok"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
+.TH HELP2MAN "1" "2019. március" "help2man 1.47.10" "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 1097bc3..5525daa 100644 (file)
--- a/help2man.it.1
+++ b/help2man.it.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.9.
-.TH HELP2MAN "1" "marzo 2019" "help2man 1.47.9" "Comandi utente"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
+.TH HELP2MAN "1" "marzo 2019" "help2man 1.47.10" "Comandi utente"
 .SH NOME
 help2man \- genera una semplice pagina di manuale
 .SH SINTASSI

diff --git a/help2man.ja.1 b/help2man.ja.1
index 3372c74..de52f6a 100644 (file)
--- a/help2man.ja.1
+++ b/help2man.ja.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.9.
-.TH HELP2MAN "1" "2019年3月" "help2man 1.47.9" "ユーザーコマンド"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
+.TH HELP2MAN "1" "2019年3月" "help2man 1.47.10" "ユーザーコマンド"
 .SH 名前
 help2man \- 簡易マニュアルページの生成
 .SH 書式

diff --git a/help2man.nb.1 b/help2man.nb.1
index adf5e55..48a1e4e 100644 (file)
--- a/help2man.nb.1
+++ b/help2man.nb.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.9.
-.TH HELP2MAN "1" "mars 2019" "help2man 1.47.9" "Brukerkommandoer"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
+.TH HELP2MAN "1" "mars 2019" "help2man 1.47.10" "Brukerkommandoer"
 .SH NAVN
 help2man \- generer en enkel manualside
 .SH OVERSIKT

diff --git a/help2man.pl.1 b/help2man.pl.1
index 229b0cf..f1c853a 100644 (file)
--- a/help2man.pl.1
+++ b/help2man.pl.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.9.
-.TH HELP2MAN "1" "marca 2019" "help2man 1.47.9" "Polecenia użytkownika"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
+.TH HELP2MAN "1" "marca 2019" "help2man 1.47.10" "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 1a4b4a2..5b7b5d1 100644 (file)
--- 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.9.
-.TH HELP2MAN "1" "março de 2019" "help2man 1.47.9" "Comandos de usuário"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
+.TH HELP2MAN "1" "março de 2019" "help2man 1.47.10" "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 9c30abf..ef8ea43 100644 (file)
--- a/help2man.ru.1
+++ b/help2man.ru.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.9.
-.TH HELP2MAN "1" "18.03.2019" "help2man 1.47.9" "Пользовательские команды"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
+.TH HELP2MAN "1" "23.03.2019" "help2man 1.47.10" "Пользовательские команды"
 .SH ИМЯ
 help2man \- генерирует простую справочную страницу
 .SH ОБЗОР

diff --git a/help2man.sr.1 b/help2man.sr.1
index f24e891..c401fe0 100644 (file)
--- a/help2man.sr.1
+++ b/help2man.sr.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.9.
-.TH ГНУ "1" "маÑ\80Ñ\82 2019." "ГНУ help2man 1.47.9" "Ð\9aоÑ\80иÑ\81ниÑ\87ке наÑ\80едбе"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
+.TH ГНУ "1" "маÑ\80Ñ\82 2019." "ГНУ help2man 1.47.10" "Ð\9aоÑ\80иÑ\81ниÑ\87ке наÑ\80едбе"
 .SH НАЗИВ
 help2man \— ствара страницу упутства
 .SH УВОД

diff --git a/help2man.sv.1 b/help2man.sv.1
index d34842a..43cea69 100644 (file)
--- a/help2man.sv.1
+++ b/help2man.sv.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.9.
-.TH HELP2MAN "1" "mars 2019" "help2man 1.47.9" "Användarkommandon"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
+.TH HELP2MAN "1" "mars 2019" "help2man 1.47.10" "Användarkommandon"
 .SH NAMN
 help2man \- generera en enkel manualsida
 .SH SYNOPSIS

diff --git a/help2man.ta.1 b/help2man.ta.1
index 92ea0ed..301c214 100644 (file)
--- a/help2man.ta.1
+++ b/help2man.ta.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.9.
-.TH HELP2MAN "1" "மார்ச் 2019" "help2man 1.47.9" "பயனர்க் கட்டளைகள்"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
+.TH HELP2MAN "1" "மார்ச் 2019" "help2man 1.47.10" "பயனர்க் கட்டளைகள்"
 .SH பெயர்
 help2man \- எளிய கையேட்டுப் பக்கத்தை உருவாக்கு
 .SH விளக்கம்

diff --git a/help2man.uk.1 b/help2man.uk.1
index c06e025..76f6201 100644 (file)
--- a/help2man.uk.1
+++ b/help2man.uk.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.9.
-.TH HELP2MAN "1" "18.03.19" "help2man 1.47.9" "Команди користувача"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
+.TH HELP2MAN "1" "23.03.19" "help2man 1.47.10" "Команди користувача"
 .SH НАЗВА
 help2man \— програма для створення простих сторінок довідника
 .SH "КОРОТКИЙ ОПИС"

diff --git a/help2man.vi.1 b/help2man.vi.1
index bf771b5..dedf8eb 100644 (file)
--- a/help2man.vi.1
+++ b/help2man.vi.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.9.
-.TH HELP2MAN "1" "Tháng 3 2019" "help2man 1.47.9" "Các câu lệnh"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
+.TH HELP2MAN "1" "Tháng 3 2019" "help2man 1.47.10" "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 665c8a0..23e2d80 100644 (file)
--- 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.9.
-.TH HELP2MAN "1" "2019 三月" "help2man 1.47.9" "用户命令"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
+.TH HELP2MAN "1" "2019 三月" "help2man 1.47.10" "用户命令"
 .SH 名称
 help2man \- 输出一份简单的手册页
 .SH 描述

diff --git a/po/help2man.pot b/po/help2man.pot
index 8732ee9..abe2945 100644 (file)
--- a/po/help2man.pot
+++ b/po/help2man.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2019-03-18 19:16+1100\n"
+"POT-Creation-Date: 2019-03-23 12:22+1100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"