Lintian Fixes - sword

Ready changes

Merge these changes:

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

Summary

Diff

=== modified file 'debian/changelog'
--- a/debian/changelog	2020-07-01 18:22:26 +0000
+++ b/debian/changelog	2020-07-01 22:09:18 +0000
@@ -1,3 +1,14 @@
+sword (1.8.1+dfsg-10) UNRELEASED; urgency=low
+
+  * Trim trailing whitespace.
+  * Use secure copyright file specification URI.
+  * Use secure URI in Homepage field.
+  * Drop unnecessary dependency on dh-autoreconf.
+  * Rely on pre-initialized dpkg-architecture variables.
+  * Fix day-of-week for changelog entry 1.5.5-1.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Wed, 01 Jul 2020 22:05:09 -0000
+
 sword (1.8.1+dfsg-9) UNRELEASED-WIP-DO-NOT-UPLOAD; urgency=medium
 
   * Replace man pages with ones from sword project repo
@@ -91,7 +102,7 @@
   * debian/*install*: install missing files
   * updated patches
   * fixed: useless depends dh-autoreconf
-  * fixed: lintian: debian-rules-should-not-use-custom-compression-settings 
+  * fixed: lintian: debian-rules-should-not-use-custom-compression-settings
     dh_builddeb
 
  -- Teus Benschop <teusjannette@gmail.com>  Thu, 01 Nov 2018 10:42:56 +0100
@@ -219,18 +230,18 @@
 
   * Rebuild with correct orig.tar.gz
   * c++ transition, Closes: #796711
-  * debian/control: 
+  * debian/control:
       diatheke provides sword-frontend, Closes: #696742
 
  -- Daniel Glassey <wdg@debian.org>  Mon, 14 Sep 2015 11:45:04 +0100
 
 sword (1.7.3+dfsg-4) unstable; urgency=medium
 
-  * debian/copyright: 
+  * debian/copyright:
       fix short names of publicdomain licences to not have spaces
       remove 'unknown license' - files are under GPL as with rest of tarball
         unless otherwise specified
-  * debian/control: 
+  * debian/control:
       standards version 3.9.6 (no changes)
       Multiarch enable library
       dh-autoreconf build dep
@@ -250,7 +261,7 @@
   * c++ transition
       rename library to libsword11v5
       blocked by ICU c++ transition
-  * add patch abicompare.patch to allow libsword to work with 
+  * add patch abicompare.patch to allow libsword to work with
       abi-compliance-checker for future transitions
 
  -- Daniel Glassey <wdg@debian.org>  Wed, 02 Sep 2015 14:15:09 +0100
@@ -299,7 +310,7 @@
 
   [ Rene Engelhard ]
   * fix FTBFS: remove include/zconf.h and don't rely on it (closes: #707537)
-  
+
   [ Dmitrijs Ledkovs ]
   * Add patch to build against clucene-core 2.
 
@@ -350,7 +361,7 @@
  -- Dmitrijs Ledkovs <xnox@debian.org>  Sat, 07 Apr 2012 14:22:48 +0100
 
 sword (1.6.2+dfsg-1) unstable; urgency=low
-  
+
   [ Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> ]
   * Revamped debian/rules to use dh tiny rules style
   * Raised compat to debhelper 7 and change associated packaging files
@@ -395,7 +406,7 @@
   * Drop shipping .la file in favour of pkg-config (Debian release goal)
     - More info http://lists.debian.org/debian-devel/2009/08/msg00783.html
   * Drop backported patches, refreshed libver & compiler warnings.
-  * Compiling with -Werror enabled. 
+  * Compiling with -Werror enabled.
   * Bumped standards version to 3.8.3, no changes needed.
   * Added debian/README.source documentation quilt usage
   * Added configure option --without-internalregex
@@ -416,10 +427,10 @@
     - Add 12_fix_compiler_warnings.diff to remove all compiler warnings.
     - Add 13_fix_osis2mod_compression_default.diff from upstream svn.
     - Add 14_closing_section_not_chapter.diff from upstream svn.
-  * debian/libsword7.*: 
+  * debian/libsword7.*:
     - Rename to libsword8.*
     - Change libsword7 to libsword8 within files.
-  * debian/rules: 
+  * debian/rules:
     - SONAME bump to 8.
     - Set library version check to >= 1.6
   * debian/control:
@@ -432,7 +443,7 @@
     - Add DFSG get-orig-source target.
   * debian/copyright:
     - Fix various mistakes in initial attempt to document copyrights.
-  
+
   [ Dmitrijs Ledkovs ]
   * debian/rules: Added utils.mk to use missing-files target and call it on
     each build.
@@ -452,9 +463,9 @@
   * debian/rules:
     - enabled shell script based testsuite
     - added commented out cppunit testsuite
-  * debian/patches/40_missing_includes.diff: 
+  * debian/patches/40_missing_includes.diff:
     - added several missing stdio.h includes to prevent FTBFS of testsuite.
-  
+
   [ Closed Bugs ]
   * FTBFS on intrepid (LP: #305172)
 
@@ -553,7 +564,7 @@
 
 sword (1.5.9-8) unstable; urgency=high
 
-  * diatheke failed to use shell_escape for the range parameter 
+  * diatheke failed to use shell_escape for the range parameter
     properly, Closes: #466449
 
  -- Daniel Glassey <wdg@debian.org>  Mon, 18 Feb 2008 22:57:25 +0000
@@ -606,7 +617,7 @@
 
 sword (1.5.9-5) unstable; urgency=low
 
-  * debian/control change libsword-dev dependency to 
+  * debian/control change libsword-dev dependency to
       libcurl4-gnutls-dev, Closes: #423936
   * include patch to build with gcc 4.3, Closes: #417717
 
@@ -622,9 +633,9 @@
 
 sword (1.5.9-4) unstable; urgency=low
 
-  * debian/control curl transition, change build dep to 
+  * debian/control curl transition, change build dep to
       libcurl4-gnutls-dev, Closes: #423936, #423958
-  * enable 06_warnings and 07_warn_tools patches 
+  * enable 06_warnings and 07_warn_tools patches
 
  -- Daniel Glassey <wdg@debian.org>  Tue, 15 May 2007 07:56:16 -0600
 
@@ -636,9 +647,9 @@
 
 sword (1.5.9-3) unstable; urgency=high
 
-  * patch 06_warnings.diff - modifications to fix some compiler warnings 
+  * patch 06_warnings.diff - modifications to fix some compiler warnings
         (not enabled in this version)
-  * patch 07_warnings_tools.diff - modifications to fix some compiler warnings 
+  * patch 07_warnings_tools.diff - modifications to fix some compiler warnings
         (not enabled in this version)
   * debian/control: diatheke to recommend not depend on webserver as
       the script can be used on its own, Closes: #358535
@@ -681,7 +692,7 @@
 
 sword (1.5.9-0ubuntu3) edgy; urgency=low
 
-  * Update debian/libsword6.shlibs with Ubuntu version of lib 
+  * Update debian/libsword6.shlibs with Ubuntu version of lib
 
  -- Raphaël Pinson <raphink@ichthux.com>  Thu, 28 Sep 2006 11:04:42 +0200
 
@@ -841,11 +852,11 @@
 
   * src/utilfuns/utilstr.cpp - toupperstr *buf++ fix
       caused segfaults when compiled with -O2
-  * fix to build with gcc 3.4 
+  * fix to build with gcc 3.4
       include/multimapwdef.h, Closes: #258768
-  * build the diatheke package again, it is still there just in a 
+  * build the diatheke package again, it is still there just in a
       different place, Closes: #229444
-  * fix documentation about modules, 
+  * fix documentation about modules,
       README.Debian, Closes: #249020
 
  -- Daniel Glassey <wdg@debian.org>  Wed, 14 Jul 2004 16:54:27 +0100
@@ -971,7 +982,7 @@
     config.sub, hopefully will sort out mips problem, Closes: #187703
   * Utilities are now really included - bug 157115 tagged for woody
   * debian/control - change section of libsword-dev to libdevel
-  * debian/rules - 
+  * debian/rules -
       remove alpha compiler flags since it is ok with gcc3.2, Closes: #142703
       use confflags like autotools-dev says
       copy the config.guess and .sub from autotools-dev
@@ -987,7 +998,7 @@
      so build-depend on libicu21-dev and icu
   * build depend on debhelper >= 4.0.0
 
- -- Daniel Glassey <wdg@debian.org>  Tue, 26 Mar 2003 18:42:28 +0000
+ -- Daniel Glassey <wdg@debian.org>  Wed, 26 Mar 2003 18:42:28 +0000
 
 sword (1.5.4+cvs20021008-1) unstable; urgency=low
 
@@ -1039,7 +1050,7 @@
   * make diatheke description useful debian/control
   * bump shlibs version to 1.5.2-9
   * debian/rules dh_shlibdeps changed to -ldebian/tmp/usr/lib
-  * compzip.cpp #include string.h and stdlib.h added for gcc 3.0 
+  * compzip.cpp #include string.h and stdlib.h added for gcc 3.0
   * README.Debian mention #sword irc channel
 
  -- Daniel Glassey <wdg@debian.org>  Fri,  8 Feb 2002 08:59:29 +0000
@@ -1084,7 +1095,7 @@
      rawtext: createSearchFramework to signed char
      rawstr: findoffset to signed char
      rawstr4: findoffset to signed char
-              in gettext make localsize to unsigned int      
+              in gettext make localsize to unsigned int
   * use -Werror in Makefile.cfg to catch any more
   *  anything else is either already fixed or will be fixed in the
         imminent version 1.5.3
@@ -1093,7 +1104,7 @@
 
 sword (1.5.2-4) unstable; urgency=low
 
-  * Change maintainer to wdg@debian.org 
+  * Change maintainer to wdg@debian.org
   * change shlibs to libsword1 >= 1.5.2-4 (gnomesword bug 123418)
       by dh_makeshlibs -V 'libsword1 (>= 1.5.2-4)' in debian/rules
   * remove reference to cheatah in package description
@@ -1102,7 +1113,7 @@
 
 sword (1.5.2-3) unstable; urgency=low
 
-  * oops, include gifs in html documentation as well 
+  * oops, include gifs in html documentation as well
   * chmod 755 before executing configure, closes #122658
   * remove autoconf from build-depends
 
@@ -1212,4 +1223,3 @@
 Local variables:
 mode: debian-changelog
 End:
-

=== modified file 'debian/control'
--- a/debian/control	2018-11-12 15:31:21 +0000
+++ b/debian/control	2020-07-01 22:06:59 +0000
@@ -16,7 +16,7 @@
  Dominique Corbex <dominique@corbex.org>,
  Teus Benschop <teusjannette@gmail.com>
 Standards-Version: 4.2.1
-Homepage: http://www.crosswire.org/sword/
+Homepage: https://www.crosswire.org/sword/
 Vcs-Browser: https://salsa.debian.org/pkg-crosswire-team/sword
 Vcs-Git: https://salsa.debian.org/pkg-crosswire-team/sword.git
 
@@ -30,8 +30,8 @@
 Multi-Arch: same
 Description: API/library for bible software
  The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
- MacOSX etc.) API/library for Bible software with a constantly growing list 
- of front-ends (GUI, textmode, web-based, etc.) and a library of over 200 
+ MacOSX etc.) API/library for Bible software with a constantly growing list
+ of front-ends (GUI, textmode, web-based, etc.) and a library of over 200
  text modules.
  .
  This package contains the core libraries for the project.
@@ -48,11 +48,11 @@
 Multi-Arch: same
 Description: Development files for libsword
  The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
- MacOSX etc.) API/library for Bible software with a constantly growing list 
- of front-ends (GUI, textmode, web-based, etc.) and a library of over 200 
+ MacOSX etc.) API/library for Bible software with a constantly growing list
+ of front-ends (GUI, textmode, web-based, etc.) and a library of over 200
  text modules.
  .
- This package contains the static libraries and headers for developing 
+ This package contains the static libraries and headers for developing
  applications that use the SWORD library.
 
 Package: libsword-common
@@ -64,8 +64,8 @@
 Multi-Arch: foreign
 Description: common settings and module repository for libsword
  The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
- MacOSX etc.) API/library for Bible software with a constantly growing list 
- of front-ends (GUI, textmode, web-based, etc.) and a library of over 200 
+ MacOSX etc.) API/library for Bible software with a constantly growing list
+ of front-ends (GUI, textmode, web-based, etc.) and a library of over 200
  text modules.
  .
  This package contains sword configuration and global module repository.
@@ -79,8 +79,8 @@
 Replaces: libsword6, libsword7, libsword8
 Description: conversion utilities for bible documents in SWORD supported formats
  The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
- MacOSX etc.) API/library for Bible software with a constantly growing list 
- of front-ends (GUI, textmode, web-based, etc.) and a library of over 200 
+ MacOSX etc.) API/library for Bible software with a constantly growing list
+ of front-ends (GUI, textmode, web-based, etc.) and a library of over 200
  text modules.
  .
  This package contains utilities to convert documents in various
@@ -94,12 +94,11 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: command line bible browsing and search tool
  The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
- MacOSX etc.) API/library for Bible software with a constantly growing list 
- of front-ends (GUI, textmode, web-based, etc.) and a library of over 200 
+ MacOSX etc.) API/library for Bible software with a constantly growing list
+ of front-ends (GUI, textmode, web-based, etc.) and a library of over 200
  text modules.
  .
  This package contains a command line utility for SWORD, allowing
  bible browsing and searching. This tool is used mostly only for
  library testing. Nicer front-ends are Xiphos (Gtk), Bibletime (Qt)
  and others.
-

=== modified file 'debian/copyright'
--- a/debian/copyright	2020-07-01 18:22:26 +0000
+++ b/debian/copyright	2020-07-01 22:06:13 +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/
 Upstream-Name: The SWORD Project
 Upstream-Contact: Members of the SWORD Project team <sword-feedback@crosswire.org>
   The CrossWire Bible Society

=== modified file 'debian/rules'
--- a/debian/rules	2020-07-01 18:22:26 +0000
+++ b/debian/rules	2020-07-01 22:08:35 +0000
@@ -1,13 +1,13 @@
 #!/usr/bin/make -f
 DH_VERBOSE := 1
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
 
 WFLAGS   := -Wall
 # Hardening
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
-	dh $@ --with autoreconf
+	dh $@
 
 
 override_dh_install:

Debdiff

[The following lists of changes regard files as different if they have different names, permissions or owners.]

Files in second set of .debs but not in first

-rw-r--r--  root/root   /usr/lib/debug/.build-id/16/2855219352c68967177754b0b928bf0b522f56.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/1e/ed04584b73b801e0ee9f425f7ade5859c6d96e.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/24/7d3086913029745d17e370f072c31376becf9f.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/37/c71a21d378f46b81a32d9835e532d2184f9d32.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/39/7d01f6bb46ad948537b0f71439c2d97c0e0cb2.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/54/2b80a4fb50786fb36b55fea952b4e1dd725d1c.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/5d/3380dc7f5b524852bd089eff0ad0d127352312.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/60/8cef59f2ac1528a127bf8ecd8ebeadc7649ab9.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/7b/42eb27c44e4b506fe2bfb3886f078a49c735cd.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/8b/22a822504766c14f8b759d91fba521597802ec.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/a9/36df89436e26a3ec3f95b32474e3130f99c435.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/bb/593fb3cd35d10978d55bb4498f73c72f61503a.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/bb/c846994e5156ae0513a3641fdb8e5aefea036c.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/c2/1049ccae077b192bc3ae4df231c6ce753a856c.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/cf/ba7bfaf542f54cc040e017e7101dd7d206f12c.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/d2/d46eef20dc5b596ddf3d805a7f82fb01b99339.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/df/8188986b665b075daf394b1e953747464d2dca.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/e1/1c416373745b1e541ae0cf096d59294966019f.debug

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/lib/debug/.build-id/15/01370e1af021caf00c07898628aa9ed386372d.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/1d/0e4b85f4da9a4edbedbebe13cc1b7b7095fe65.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/87/e56a82fdfb41f0fc72131c5210f9fafdfa13eb.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/92/1df5413e2fb2dce87892390b4d27a58bf9810b.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/99/5d9b4a92f740d0b8562947fdf88f8a2bacdd12.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/9c/be6c2114ba1a3f6e65f6fcbf22cd628b80a4ba.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/a0/bd88e70ff731a786392bb5e7f28f1feca1dac4.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/a8/3a63501ba0a90b5c8f0765fdc733139745fc24.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/ba/5a4eb50dbb7df9c99cbfc6d580c064913dfaa0.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/bb/e0e2cae21317f5ca6ae1043e2a482ecc0472aa.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/c0/268382f87f38317227675814ea74439643669c.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/c1/d04ced47f875ae77e590e5c828ba6a7b8812d3.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/c6/42c55f96f73daf17e61fea98ec3998a1a9f222.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/c8/6646f0a9307208ca2433bdb421b6c8e74e1505.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/df/613866e9996749d785b9d7b5125dddb2f9c9a5.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/ed/ba8c2e2ac00d7fb69816e1f6222733aed11dc2.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/f1/d2e08cb1cde567c91f4ddbc83b0a6840c530f8.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/f5/f6eb7f7d653bdc8c1abed11f5960b5d84f019f.debug

Control files of package diatheke: lines which differ (wdiff format)

  • Homepage: http://www.crosswire.org/sword/ https://www.crosswire.org/sword/

Control files of package diatheke-dbgsym: lines which differ (wdiff format)

  • Build-Ids: 1501370e1af021caf00c07898628aa9ed386372d 397d01f6bb46ad948537b0f71439c2d97c0e0cb2

Control files of package libsword-1.8.1: lines which differ (wdiff format)

  • Homepage: http://www.crosswire.org/sword/ https://www.crosswire.org/sword/

Control files of package libsword-1.8.1-dbgsym: lines which differ (wdiff format)

  • Build-Ids: bbe0e2cae21317f5ca6ae1043e2a482ecc0472aa bb593fb3cd35d10978d55bb4498f73c72f61503a

Control files of package libsword-common: lines which differ (wdiff format)

  • Homepage: http://www.crosswire.org/sword/ https://www.crosswire.org/sword/

Control files of package libsword-dev: lines which differ (wdiff format)

  • Homepage: http://www.crosswire.org/sword/ https://www.crosswire.org/sword/

Control files of package libsword-utils: lines which differ (wdiff format)

  • Homepage: http://www.crosswire.org/sword/ https://www.crosswire.org/sword/

Control files of package libsword-utils-dbgsym: lines which differ (wdiff format)

  • Build-Ids: 1d0e4b85f4da9a4edbedbebe13cc1b7b7095fe65 87e56a82fdfb41f0fc72131c5210f9fafdfa13eb 921df5413e2fb2dce87892390b4d27a58bf9810b 995d9b4a92f740d0b8562947fdf88f8a2bacdd12 9cbe6c2114ba1a3f6e65f6fcbf22cd628b80a4ba a0bd88e70ff731a786392bb5e7f28f1feca1dac4 a83a63501ba0a90b5c8f0765fdc733139745fc24 ba5a4eb50dbb7df9c99cbfc6d580c064913dfaa0 c0268382f87f38317227675814ea74439643669c c1d04ced47f875ae77e590e5c828ba6a7b8812d3 c642c55f96f73daf17e61fea98ec3998a1a9f222 c86646f0a9307208ca2433bdb421b6c8e74e1505 df613866e9996749d785b9d7b5125dddb2f9c9a5 edba8c2e2ac00d7fb69816e1f6222733aed11dc2 f1d2e08cb1cde567c91f4ddbc83b0a6840c530f8 f5f6eb7f7d653bdc8c1abed11f5960b5d84f019f 162855219352c68967177754b0b928bf0b522f56 1eed04584b73b801e0ee9f425f7ade5859c6d96e 247d3086913029745d17e370f072c31376becf9f 37c71a21d378f46b81a32d9835e532d2184f9d32 542b80a4fb50786fb36b55fea952b4e1dd725d1c 5d3380dc7f5b524852bd089eff0ad0d127352312 608cef59f2ac1528a127bf8ecd8ebeadc7649ab9 7b42eb27c44e4b506fe2bfb3886f078a49c735cd 8b22a822504766c14f8b759d91fba521597802ec a936df89436e26a3ec3f95b32474e3130f99c435 bbc846994e5156ae0513a3641fdb8e5aefea036c c21049ccae077b192bc3ae4df231c6ce753a856c cfba7bfaf542f54cc040e017e7101dd7d206f12c d2d46eef20dc5b596ddf3d805a7f82fb01b99339 df8188986b665b075daf394b1e953747464d2dca e11c416373745b1e541ae0cf096d59294966019f

Run locally

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

debcheckout sword
cd sword
lintian-brush

More details

Full run details