Lintian Fixes - debiandoc-sgml

Ready changes

Merge these changes:

git pull https://janitor.debian.net/git/debiandoc-sgml lintian-fixes

Summary

Diff

=== modified file 'debian/changelog'
--- a/debian/changelog	2018-07-16 08:16:54 +0000
+++ b/debian/changelog	2020-04-29 02:15:48 +0000
@@ -1,3 +1,13 @@
+debiandoc-sgml (1.2.32-3) UNRELEASED; urgency=medium
+
+  * Trim trailing whitespace.
+  * Use secure copyright file specification URI.
+  * Wrap long lines in changelog entries: 1.1.97.
+  * Refer to specific version of license GPL-2+.
+  * Fix day-of-week for changelog entry 1.1.93.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Wed, 29 Apr 2020 02:12:07 +0000
+
 debiandoc-sgml (1.2.32-2) unstable; urgency=medium
 
   * Update VCS to new salsa service in compliance to the Debian
@@ -26,7 +36,7 @@
     - tools/bin/template: Globally replaced nsgmls -> onsgmls
     - tools/man/debiandoc-sgml.1: Globally replaced nsgmls -> onsgmls
     - (Closes: #805061)
-    
+
  -- Neil Roeth <neil@debian.org>  Mon, 18 Jan 2016 15:27:52 -0500
 
 debiandoc-sgml (1.2.31-1) unstable; urgency=medium
@@ -53,13 +63,13 @@
 
 debiandoc-sgml (1.2.28-1) unstable; urgency=low
 
-  * Jessie development cycle is ON! 
+  * Jessie development cycle is ON!
   * Switch to 3.0(quilt) format.
   * Fix URLs containing '&' (ampersand) using a patch provided by Ben
     Hutchings, thanks. Closes: #685046
   * Make <a name> anchors enclose heading text using a patch provided by
     Samuel Bronson. Closes: #616043
-  * Make debiandoc2dbkpo behave with an SGML without the localization 
+  * Make debiandoc2dbkpo behave with an SGML without the localization
     infix using a patch provided by Felix Gatzemeier.  Closes: #694856
 
  -- Osamu Aoki <osamu@debian.org>  Sun, 19 May 2013 02:20:15 +0900
@@ -73,19 +83,19 @@
 debiandoc-sgml (1.2.26) unstable; urgency=low
 
   * Update for multiarch. Closes: #665825
-  * Update DocBook XML conversion to specify utf-8 encoding in the 
+  * Update DocBook XML conversion to specify utf-8 encoding in the
     XML declaration. Closes: #663279
-  * Update packaging to Policy 3.9.3 and dh v9. 
+  * Update packaging to Policy 3.9.3 and dh v9.
 
  -- Osamu Aoki <osamu@debian.org>  Wed, 28 Mar 2012 21:45:49 +0900
 
 debiandoc-sgml (1.2.25) unstable; urgency=low
 
   * Use proper serif font for Chinese in LaTeX. Closes: #593916
-  * Fixed title breakage for french. Closes: #594846 
-  * Fixed missing hyphen for package, prgn, and manref. Closes: #238003 
-  * Fixed doubling of \ in manref. 
-  * Fixed " in tt, prgn, and package. 
+  * Fixed title breakage for french. Closes: #594846
+  * Fixed missing hyphen for package, prgn, and manref. Closes: #238003
+  * Fixed doubling of \ in manref.
+  * Fixed " in tt, prgn, and package.
 
  -- Osamu Aoki <osamu@debian.org>  Fri, 03 Jun 2011 23:58:12 +0900
 
@@ -99,16 +109,16 @@
 
 debiandoc-sgml (1.2.23) unstable; urgency=low
 
-  * Updated examples by adding msguntranslated. 
+  * Updated examples by adding msguntranslated.
   * DB5 style by using no firstname/surname but just personname to
     fix Japanese etc.
-  * Make header friendly for entity. 
+  * Make header friendly for entity.
 
  -- Osamu Aoki <osamu@debian.org>  Sun, 17 Apr 2011 03:46:33 +0900
 
 debiandoc-sgml (1.2.22) unstable; urgency=low
 
-  * Fixed translator handling for debiandoc2dbk as othercredit. 
+  * Fixed translator handling for debiandoc2dbk as othercredit.
 
  -- Osamu Aoki <osamu@debian.org>  Sun, 06 Mar 2011 17:54:25 +0900
 
@@ -117,16 +127,16 @@
   * Changed font size and page margins for LaTeX to fit more on one page.
     Now <example> is rendered in \scriptsize. Closes: #606462
   * Made README in examples as a pointer to wiki page.
-  * Fixed syntax of <copyright>...</copyright> for debiandoc2dbk. 
+  * Fixed syntax of <copyright>...</copyright> for debiandoc2dbk.
     Closes: #430606
-  * Fixed title attribute of <link> tags to be be plain text for 
+  * Fixed title attribute of <link> tags to be be plain text for
     debiandoc2html. Closes: #616042
 
  -- Osamu Aoki <osamu@debian.org>  Sun, 06 Mar 2011 01:39:20 +0900
 
 debiandoc-sgml (1.2.20) unstable; urgency=low
 
-  * Optimized dependency to reflect current package names while including 
+  * Optimized dependency to reflect current package names while including
     changes made in 1.2.16+squeeze1 to address bug #610335 for experimental.
   * Rewrote debiandoc-lint4po for better conversion.
 
@@ -167,7 +177,7 @@
 debiandoc-sgml (1.2.16) unstable; urgency=low
 
   * Updated dependency of debiandoc-sgml. Closes: #462253, #593820
-  * Fixed debiandoc2xml to generate correct tags for <section>, use better 
+  * Fixed debiandoc2xml to generate correct tags for <section>, use better
     XML syntax, and convert &copy; to (C). Closes: #608461, #430575
   * Updated Korean UTF-8 LaTeX template.
 
@@ -176,21 +186,21 @@
 debiandoc-sgml (1.2.15) unstable; urgency=low
 
   * Fixed manpage.  Closes: #568015
-  * Cleaned old maintainer scripts. 
+  * Cleaned old maintainer scripts.
 
  -- Osamu Aoki <osamu@debian.org>  Sun, 11 Apr 2010 02:03:31 +0900
 
 debiandoc-sgml (1.2.14) unstable; urgency=low
 
-  * Updated build structure to use dh syntax and $(DESTDIR). 
+  * Updated build structure to use dh syntax and $(DESTDIR).
   * Fixed binary-control-field-duplicates-source: "priority" "section".
-  * Fixed hyphen-used-as-minus-sign. 
+  * Fixed hyphen-used-as-minus-sign.
 
  -- Osamu Aoki <osamu@debian.org>  Sun, 04 Apr 2010 21:42:28 +0900
 
 debiandoc-sgml (1.2.13) unstable; urgency=low
 
-  * Close CVS repository and merged typo fixes on debiandoc2latex* 
+  * Close CVS repository and merged typo fixes on debiandoc2latex*
     by Martin Eberhard Schauer <Martin.E.Schauer@gmx.de> posted on
     debian-l10n-german@lists.debian.org and committed by Jens Seidel
     on Wed, 25 Jul 2008.
@@ -217,8 +227,8 @@
 
 debiandoc-sgml (1.2.10) unstable; urgency=low
 
-  * Now that lenny is out, I will fix this nbsp bug with somewhat 
-    invasive changes per patch by Nicolas François for HTML.  I 
+  * Now that lenny is out, I will fix this nbsp bug with somewhat
+    invasive changes per patch by Nicolas François for HTML.  I
     also applied similar patches to SGML and XML too. (closes: #512579)
 
  -- Osamu Aoki <osamu@debian.org>  Sat, 29 Aug 2009 02:28:01 +0900
@@ -235,7 +245,7 @@
   * Fixed description and code is refering to tetex-bin and tetex-extra
     per Andreas Tille.  (closes: #445807)
   * Updated gs-gpl to ghostscript.
-  * Changed link tag generation as default and meaning of -L option 
+  * Changed link tag generation as default and meaning of -L option
     because most console users use w3m now per popcon. (closes: #402122)
   * Added -C option for content negotiation without encoding.
   * Added lower case locale alias such as 'pt-br' and 'zh-cn.utf-8',
@@ -280,7 +290,7 @@
 
 debiandoc-sgml (1.2.3) unstable; urgency=low
 
-  * Added missing fr_FR.UTF-8 data to Alias.pm. 
+  * Added missing fr_FR.UTF-8 data to Alias.pm.
 
  -- Osamu Aoki <osamu@debian.org>  Sun, 12 Aug 2007 23:27:47 +0900
 
@@ -354,7 +364,7 @@
   * Added Vietnamese translation. Thanks to Clytie Siddall
     <clytie@riverland.net.au>. [jens]
   * Replaced cjk-latex with latex-cjk-all
-  * Removed old hack for zh_TW (big5) Latex code handling in fixlatex 
+  * Removed old hack for zh_TW (big5) Latex code handling in fixlatex
     script.
   * Changed font names in chinese to bkai in latex code.
 
@@ -362,23 +372,23 @@
 
 debiandoc-sgml (1.1.97) unstable; urgency=low
 
-  * Added support for Swedish. Many thanks to 
+  * Added support for Swedish. Many thanks to
     Daniel Nylander <yeager@lidkoping.net>. [jens] (closes: Bug#397235)
-  * Added support for Vietnamese (with English strings). This requires
-    either the package texlive-lang-vietnamese or tetex-extra for PS, PDF. [jens]
+  * Added support for Vietnamese (with English strings). This requires either
+    the package texlive-lang-vietnamese or tetex-extra for PS, PDF. [jens]
 
  -- Osamu Aoki <osamu@debian.org>  Sun, 05 Nov 2006 02:05:42 +0900
 
 debiandoc-sgml (1.1.96) unstable; urgency=low
 
-  * Added support for Ukrainian and UTF-8. Many thanks to 
+  * Added support for Ukrainian and UTF-8. Many thanks to
     Borys Yanovych and Eugeniy Meshcheryakov. [jens] (closes: Bug#366992)
 
  -- Osamu Aoki <osamu@debian.org>  Sun, 21 May 2006 02:05:42 +0900
 
 debiandoc-sgml (1.1.95) unstable; urgency=low
 
-  * Fixed Format/HTML.pm to generate correct bullets for list in 
+  * Fixed Format/HTML.pm to generate correct bullets for list in
     TOC with nicer indentations. (closes: Bug#355406)
 
  -- Osamu Aoki <osamu@debian.org>  Sun, 12 Mar 2006 02:05:42 +0900
@@ -399,16 +409,16 @@
   * Avoid using dvips option -z if it fails such as for Debian Reference's
     zh_CN dvi file (closes: Bug#341849). [jens]
 
- -- Osamu Aoki <osamu@debian.org>  Mon, 03 Dec 2005 18:25:12 +0900
+ -- Osamu Aoki <osamu@debian.org>  Sat, 03 Dec 2005 18:25:12 +0900
 
 debiandoc-sgml (1.1.92) unstable; urgency=low
 
-  * Fixed bogus horizontal line in the list in HTML 
+  * Fixed bogus horizontal line in the list in HTML
     (closes: Bug#256076)
   * Provided default value of -d option to be
     /usr/share/sgml/debiandoc/dtd/sgml/1.0/debiandoc.dcl
     (closes: Bug#213332)
-  * Close all wontfix-type wishlist bugs. 
+  * Close all wontfix-type wishlist bugs.
     (closes: Bug#63318, Bug#137998, Bug#140684, Bug#141727, Bug#235793)
   * Updated TODO and README.Debian files.
 
@@ -422,7 +432,7 @@
 
 debiandoc-sgml (1.1.90) unstable; urgency=low
 
-  * Renamed old info based debiandoc2xml script to 
+  * Renamed old info based debiandoc2xml script to
     debiandoc2docbookxml and marked as deprecated.
   * Added debiandoc2sgml and debiandoc2xml scrips which convert
     directly to formatted SGML and XML.
@@ -454,8 +464,8 @@
     (thanks to Piarres Beobide Egaña <pi@beobide.net>) [jens]
    * Readd option -1 to debiandoc2ps to ensure compatibility with
      older build scripts. This deprecated feature may be removed again
-     after sarge release (closes: #301684) (Thanks to Frank 
-     Lichtenheld <djpig@debian.org>). [osamu] 
+     after sarge release (closes: #301684) (Thanks to Frank
+     Lichtenheld <djpig@debian.org>). [osamu]
 
  -- Osamu Aoki <osamu@debian.org>  Fri, 15 Apr 2005 12:09:36 +0200
 
@@ -488,7 +498,7 @@
   * Use "ngerman" language option instead of "german" for using new German
     orthography in LaTeX formats [jens]
   * debian/control: added 'Jens Seidel <tux-master@web.de>' to
-    'Uploaders' [ardo] 
+    'Uploaders' [ardo]
 
  -- Osamu Aoki <osamu@debian.org>  Mon, 21 Feb 2005 21:57:45 +0100
 
@@ -864,7 +874,7 @@
 
 debiandoc-sgml (1.1.49) unstable; urgency=low
 
-  * Format/LaTex.pm: changed PDF hyperlinks from boxed to colored 
+  * Format/LaTex.pm: changed PDF hyperlinks from boxed to colored
   * Format/LaTeX.pm: fixed paragraph spacing in footnotes and comments
     (closes: Bug#99289)
   * Format/LaTeX.pm: fixed multiple line quotation handling
@@ -978,7 +988,7 @@
     (closes: Bug#60313)
   * Fixed broken handling of <comment> (also combined with <footnote>)
     (closes: Bug#59032) (thanks Josip!)
-  * Fixed broken handling of nested <taglist>s  
+  * Fixed broken handling of nested <taglist>s
   * Format/LaTeX.pm: fixed broken cross-referencing (thanks Ross!)
     (closes: Bug#61037)
   * Format/LaTeX.pm: fixed broken handling of special characters
@@ -1015,7 +1025,7 @@
   * Format/LaTeX.pm: fixed SDATA/CDATA incorrect handling in examples
     (Closes: #53556) (thanks James!)
   * scripts/*: made passing on of command line parameters consistent and
-    complete 
+    complete
   * debian/postinst: added old cruft removal (Closes: #51027) (thanks Joey!)
   * debian/control: moved all Perl modules needed for HTML output from
     'Recommends' to 'Depends' (Closes: #52191) (thanks Adam!)
@@ -1250,7 +1260,7 @@
  -- Ardo van Rangelrooij <ardo@debian.org>  Mon, 22 Mar 1999 19:58:21 +0100
 
 debiandoc-sgml (1.1.16) unstable; urgency=low
-  
+
   * Added PDF via LaTeX2e output generation (fulfilling wishlist #33379)
     (thanks Adam!)
   * Completed i18n support for Croatian (thanks Matej!)
@@ -1297,7 +1307,7 @@
   * spec/texinfo: added empty lines before and after <example>s (start of
     fixing the second half of bug #14747)
   * dtd/debiandoc.dtd: added compact attribute to <example>
-  * spec/*: fixed handling <p>s within <taglist>'s <item>s (fixing bug #31538) 
+  * spec/*: fixed handling <p>s within <taglist>'s <item>s (fixing bug #31538)
   * spec/*: started reimplementing handling empty lines around paragraphs,
     lists, and examples
   * dtd/debiandoc.dtd: made <email> in <author> optional (fixing bug #31493)
@@ -1481,13 +1491,13 @@
 
 debiandoc-sgml (1.0.15) frozen unstable; urgency=medium
 
-  * Changed suggested libpaper into libpaperg (fixes bug #20014). 
-  * Removed explicit use of /usr/lib/sgml and /etc/sgml.catalog from the 
-    debiandoc2* scripts, since nsgmls already "knows" about them (fixes 
-    second part of bug #19718). 
-  * Added uninstall target to Makefile to help keeping /usr/local/ clean. 
+  * Changed suggested libpaper into libpaperg (fixes bug #20014).
+  * Removed explicit use of /usr/lib/sgml and /etc/sgml.catalog from the
+    debiandoc2* scripts, since nsgmls already "knows" about them (fixes
+    second part of bug #19718).
+  * Added uninstall target to Makefile to help keeping /usr/local/ clean.
   * Fixed dependency bug in Makefile causing debian/tmp paths in scripts
-    (fixes bug #19863 and first part of bug #19718). 
+    (fixes bug #19863 and first part of bug #19718).
 
  -- Ardo van Rangelrooij <ardo.van.rangelrooij@tip.nl>  Tue, 17 Mar 1998 13:28:12 +0100
 
@@ -1500,13 +1510,13 @@
 
 debiandoc-sgml (1.0.13) unstable; urgency=low
 
-  * Fixed debiandoc2ps bug: excluding tilde character in output (bug #17623). 
+  * Fixed debiandoc2ps bug: excluding tilde character in output (bug #17623).
 
  -- Ardo van Rangelrooij <ardo.van.rangelrooij@tip.nl>  Tue, 17 Feb 1998 21:19:35 +0100
 
 debiandoc-sgml (1.0.12) unstable; urgency=low
 
-  * New maintainer. 
+  * New maintainer.
 
  -- Ardo van Rangelrooij <ardo.van.rangelrooij@tip.nl>  Wed, 14 Jan 1998 20:11:13 +0100
 

=== modified file 'debian/copyright'
--- a/debian/copyright	2014-10-19 08:18:19 +0000
+++ b/debian/copyright	2020-04-29 02:15:09 +0000
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: http://git.debian.org/?p=collab-maint/debiandoc-sgml.git
 Comment: This the Debian package of DebianDoc-SGML, an SGML based
  documentation formatting package used for the Debian manuals.
@@ -28,7 +28,7 @@
  for more details.
  .
  You should have received a copy of the GNU General Public License with
- your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or
+ your Debian GNU/Linux system, in /usr/share/common-licenses/GPL-2, or
  with the debiandoc-sgml source package as the file COPYING.  If not,
  write to the Free Software Foundation, Inc.,
  51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.

Debdiff

File lists identical (after any substitutions)

No differences were encountered in the control files

Run locally

Try this locally (using the lintian-brush package):

debcheckout debiandoc-sgml
cd debiandoc-sgml
lintian-brush

More details

Full run details