Lintian Fixes - libpwiz

Ready changes

Merge these changes:

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

Summary

Diff

diff --git a/debian/changelog b/debian/changelog
index c001c59..4008391 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libpwiz (3.0.18342-4) UNRELEASED; urgency=low
+
+  * Trim trailing whitespace.
+  * Use secure copyright file specification URI.
+  * Move source package lintian overrides to debian/source.
+  * Rely on pre-initialized dpkg-architecture variables.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Fri, 26 Jun 2020 13:31:01 -0000
+
 libpwiz (3.0.18342-3) unstable; urgency=low
 
   * Add patch by Dimitri John Ledkov <xnox@ubuntu.com> forwarded by Adrian
@@ -47,17 +56,17 @@ libpwiz (3.0.10827-4) unstable; urgency=medium
 
 libpwiz (3.0.10827-3) unstable; urgency=medium
 
-  * debian/control: Replace tabs with spaces. 
+  * debian/control: Replace tabs with spaces.
 
   * debian/control: fix libboost-dev dependency so that
-    /usr/include/boost/lexical_cast.hpp is there although the library 
+    /usr/include/boost/lexical_cast.hpp is there although the library
     fine even without it, it is required by dependencies.
 
  -- Filippo Rusconi <lopippo@debian.org>  Wed, 05 Jul 2017 20:25:53 +0200
 
 libpwiz (3.0.10827-2) unstable; urgency=medium
 
-  * debian/control: add dependency to libbost-dev. 
+  * debian/control: add dependency to libbost-dev.
 
  -- Filippo Rusconi <lopippo@debian.org>  Sat, 01 Jul 2017 22:52:58 +0200
 
@@ -68,7 +77,7 @@ libpwiz (3.0.10827-1) unstable; urgency=medium
   * debian/control Standards-Version: 4.0.0
 
   * Use the trigger infrastructure to call ldconfig.
-  
+
   * debian/copyright: thorough rework using licensecheck  + manual checking.
 
  -- Filippo Rusconi <lopippo@debian.org>  Tue, 27 Jun 2017 10:17:49 +0200
@@ -82,7 +91,7 @@ libpwiz (3.0.9393-1) unstable; urgency=medium
   * debian/control Standards-Version: 3.9.7 (no changes)
 
  -- Filippo Rusconi <lopippo@debian.org>  Mon, 21 Mar 2016 16:33:44 +0100
- 
+
 libpwiz (3.0.8789-1) unstable; urgency=medium
 
   * New upstream version.
@@ -121,7 +130,7 @@ libpwiz (3.0.6585-2) unstable; urgency=medium
 libpwiz (3.0.6585-1) unstable; urgency=medium
 
   * New upstream version.
-  
+
   * Patch to fix autotools-based boost-related glitches.
 
  -- Filippo Rusconi <lopippo@debian.org>  Wed, 13 Aug 2014 17:09:10 +0200
@@ -140,7 +149,7 @@ libpwiz (3.0.4624-9) unstable; urgency=low
     <Dejan.Latinovic@imgtec.com> to fix the build problem on mips/mipsel
     platforms that was not resolved as of version 3.0.4624-8. Closing bug,
     this time for good, hopefully. (Closes: #738137).
-  
+
  -- Filippo Rusconi <lopippo@debian.org>  Sun, 02 Mar 2014 12:53:59 +0100
 
 libpwiz (3.0.4624-8) unstable; urgency=low
@@ -196,40 +205,40 @@ libpwiz (3.0.4624-3) unstable; urgency=low
   * debian/control: set entries in Build-Depends about Boost libs on
     unversioned -dev packages (Closes: #722189). This time rebuild the
     binary package.
-  
+
  -- Filippo Rusconi <lopippo@debian.org>  Thu, 14 Nov 2013 10:24:59 +0100
 
 libpwiz (3.0.4624-2) unstable; urgency=low
 
   * debian/control: set entries in Build-Depends about Boost libs on
     unversioned -dev packages (Closes: #722189).
-  
+
  -- Filippo Rusconi <lopippo@debian.org>  Wed, 30 Oct 2013 20:53:16 +0100
 
 libpwiz (3.0.4624-1) unstable; urgency=low
 
   * New upstream release (Closes: #693044);
-  
+
   * debian/control: Vcs-Git and Vcs-Browser now use the canonical URIs;
-  
+
   * debian/copyright : fixes to the format and made a general overview
     after new upstream release;
-  
+
   * debian/control: Standards-Version: 3.9.4;
-  
+
   * debian/control: add dependency on autotools-dev to lift the lintian
     warning complaining about outdated-autotools-helper-file
     autotools/config.guess 2006-07-02;
-  
+
   * add #DEBHELPER# to libpwiz3.postinst to lift the lintian complaining
     that maintainer-script-lacks-debhelper-token debian/libpwiz3.postinst;
-  
+
  -- Filippo Rusconi <lopippo@debian.org>  Thu, 29 Aug 2013 16:22:04 +0200
 
 libpwiz (3.0.4098-2) UNRELEASED; urgency=low
 
   * Initial release (Closes: #693044).
-  
+
   * Fix to the version of the license for the debian/* files.
 
  -- Filippo Rusconi <lopippo@debian.org>  Mon, 05 Nov 2012 21:37:18 +0100
diff --git a/debian/control b/debian/control
index cf2e6ff..87a9cc6 100644
--- a/debian/control
+++ b/debian/control
@@ -112,4 +112,3 @@ Description: set of programs to perform proteomics data analyses (doc)
  .
  This package ships the documentation to the proteowizard software
  along with example programs (source code and binaries).
-
diff --git a/debian/copyright b/debian/copyright
index a789113..656ba3b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -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: libpwiz
 Source: http://proteowizard.sourceforge.net/downloads.shtml
 
diff --git a/debian/rules b/debian/rules
index 495c940..22bf83f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,10 +3,7 @@
 export DH_VERBOSE=1
 export DH_OPTIONS=-v
 
-DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
 
 DEBIAN_DIR = $(CURDIR)/debian
 BUILD_DIR = $(DEBIAN_DIR)/build
@@ -77,7 +74,7 @@ clean:
 	dh_clean
 
 .PHONY: configure
-configure: 
+configure:
 	@echo "entering the configure target"
 	dh_testdir
 	dh_prep -a
@@ -126,7 +123,7 @@ build-arch-stamp: configure-stamp
 
 # Now that the build is fine and the built files installed,
 # remove all the RPATH stuff from these binaries.
-	@echo "Removing the RPATH datum from the binaries." 
+	@echo "Removing the RPATH datum from the binaries."
 	sh debian/remove-rpath-from-binaries.sh
 
 # Prepare a mirroring hierarchy for all the header files of the
@@ -233,4 +230,3 @@ binary-arch: build-arch
 
 .PHONY: binary
 binary: binary-arch binary-indep
-
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index 1964afd..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,33 +0,0 @@
-libpwiz source: debian-watch-file-is-missing
-
-libpwiz source: file-without-copyright-information BUILDING
-libpwiz source: file-without-copyright-information LICENSE
-libpwiz source: file-without-copyright-information NOTICE
-libpwiz source: file-without-copyright-information autotools/AUTHORS
-libpwiz source: file-without-copyright-information autotools/COPYING
-libpwiz source: file-without-copyright-information autotools/ChangeLog
-libpwiz source: file-without-copyright-information autotools/INSTALL
-libpwiz source: file-without-copyright-information autotools/Makefile.am
-libpwiz source: file-without-copyright-information autotools/NEWS
-libpwiz source: file-without-copyright-information autotools/README
-libpwiz source: file-without-copyright-information autotools/aclocal.m4
-libpwiz source: file-without-copyright-information autotools/boost.m4
-libpwiz source: file-without-copyright-information autotools/config.guess
-libpwiz source: file-without-copyright-information autotools/config.h.in
-libpwiz source: file-without-copyright-information autotools/config.sub
-libpwiz source: file-without-copyright-information autotools/configure
-libpwiz source: file-without-copyright-information autotools/configure.ac
-libpwiz source: file-without-copyright-information autotools/depcomp
-libpwiz source: file-without-copyright-information autotools/install-sh
-libpwiz source: file-without-copyright-information autotools/missing
-libpwiz source: file-without-copyright-information doc/dox/Doxyfile
-libpwiz source: file-without-copyright-information doc/dox/mainpage.hpp
-libpwiz source: file-without-copyright-information libraries/CSpline/LICENSE
-libpwiz source: file-without-copyright-information libraries/libsvm-3.0/COPYRIGHT
-libpwiz source: file-without-copyright-information libraries/libsvm-3.0/README
-libpwiz source: file-without-copyright-information pwiz/Version.cpp
-libpwiz source: file-without-copyright-information pwiz/analysis/Version.cpp
-libpwiz source: file-without-copyright-information pwiz/data/identdata/Version.cpp
-libpwiz source: file-without-copyright-information pwiz/data/msdata/Version.cpp
-libpwiz source: file-without-copyright-information pwiz/data/proteome/Version.cpp
-libpwiz source: file-without-copyright-information pwiz/data/tradata/Version.cpp
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 4d617bd..1964afd 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,17 +1,33 @@
-libpwiz source: file-without-copyright-information SUBSET
+libpwiz source: debian-watch-file-is-missing
+
 libpwiz source: file-without-copyright-information BUILDING
 libpwiz source: file-without-copyright-information LICENSE
-libpwiz source: file-without-copyright-information autotools/*
-libpwiz source: file-without-copyright-information pwiz/Version.cpp
-libpwiz source: file-without-copyright-information pwiz/analysis/Version.cpp
-libpwiz source: file-without-copyright-information libraries/libsvm-3.0/COPYRIGHT
-libpwiz source: file-without-copyright-information libraries/libsvm-3.0/README
+libpwiz source: file-without-copyright-information NOTICE
+libpwiz source: file-without-copyright-information autotools/AUTHORS
+libpwiz source: file-without-copyright-information autotools/COPYING
+libpwiz source: file-without-copyright-information autotools/ChangeLog
+libpwiz source: file-without-copyright-information autotools/INSTALL
+libpwiz source: file-without-copyright-information autotools/Makefile.am
+libpwiz source: file-without-copyright-information autotools/NEWS
+libpwiz source: file-without-copyright-information autotools/README
+libpwiz source: file-without-copyright-information autotools/aclocal.m4
+libpwiz source: file-without-copyright-information autotools/boost.m4
+libpwiz source: file-without-copyright-information autotools/config.guess
+libpwiz source: file-without-copyright-information autotools/config.h.in
+libpwiz source: file-without-copyright-information autotools/config.sub
+libpwiz source: file-without-copyright-information autotools/configure
+libpwiz source: file-without-copyright-information autotools/configure.ac
+libpwiz source: file-without-copyright-information autotools/depcomp
+libpwiz source: file-without-copyright-information autotools/install-sh
+libpwiz source: file-without-copyright-information autotools/missing
 libpwiz source: file-without-copyright-information doc/dox/Doxyfile
 libpwiz source: file-without-copyright-information doc/dox/mainpage.hpp
 libpwiz source: file-without-copyright-information libraries/CSpline/LICENSE
+libpwiz source: file-without-copyright-information libraries/libsvm-3.0/COPYRIGHT
+libpwiz source: file-without-copyright-information libraries/libsvm-3.0/README
+libpwiz source: file-without-copyright-information pwiz/Version.cpp
+libpwiz source: file-without-copyright-information pwiz/analysis/Version.cpp
 libpwiz source: file-without-copyright-information pwiz/data/identdata/Version.cpp
 libpwiz source: file-without-copyright-information pwiz/data/msdata/Version.cpp
 libpwiz source: file-without-copyright-information pwiz/data/proteome/Version.cpp
 libpwiz source: file-without-copyright-information pwiz/data/tradata/Version.cpp
-libpwiz source: file-without-copyright-information pwiz/utility/misc/pinned_gcroot.h
-

Debdiff

File lists identical (after any substitutions)

No differences were encountered between the control files of package libpwiz-dev

No differences were encountered between the control files of package libpwiz-doc

No differences were encountered between the control files of package libpwiz-tools

No differences were encountered between the control files of package libpwiz-tools-dbgsym

No differences were encountered between the control files of package libpwiz3

No differences were encountered between the control files of package libpwiz3-dbgsym

Run locally

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

debcheckout libpwiz
cd libpwiz
lintian-brush

More details

Full run details