diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | help2man.html.PL | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 413e662..90a350f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ help2man (1.47.16) unstable; urgency=medium * Move table of contents to the top of the texi file so that it appears in the correct location in the html page (thanks to Michael Siegel). * Update debian/rules maint-prep warning about $version mismatch. + * Update help2man.html.PL for new GNU boilerplate. - -- Brendan O'Dea <bod@debian.org> Thu, 02 Jul 2020 22:01:37 +1000 + -- Brendan O'Dea <bod@debian.org> Thu, 02 Jul 2020 23:21:58 +1000 help2man (1.47.15) unstable; urgency=medium diff --git a/help2man.html.PL b/help2man.html.PL index e645fd6..2016d4e 100755 --- a/help2man.html.PL +++ b/help2man.html.PL @@ -2,7 +2,7 @@ # Combine generated html page with GNU boilerplate. -# Copyright (C) 2012 Free Software Foundation, Inc. +# Copyright (C) 2012, 2020 Free Software Foundation, Inc. # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright @@ -35,9 +35,9 @@ do { for ($boilerplate) { s#\$Revision:\s+(\S+)\s+\$#$1#; - s#<!-- This is the template document.*?-->\s+##s; - s#<!-- Instructions for adapting.*?-->\s*(<!-- \d+\. .*?-->\s*)*##s; + s#<!-- ~+ -->(?:\s+<!--.*?-->)*##s; s#<title>Baz\s+(- GNU Project)#<title>help2man $1#s; + s#\bbug-baz\b#bug-help2man#g; s#<h2>GNU\sBaz</h2>.*(</div><!--\s+for\s+id="content")#%body%$1#s; } @@ -53,7 +53,7 @@ my $gnu_standards = "http://www.gnu.org/prep/standards/standards.html"; my $body = <$texi_tmp>; for ($body) { - s#^.*<body>##s; + s#^.*<body(?:\s[^>]*)?>##s; s#</body>.*##s; # Fixup references |