Lintian Fixes - apt-cacher-ng

Ready changes

Merge these changes:

git pull https://janitor.debian.net/git/apt-cacher-ng lintian-fixes

Summary

Diff

=== modified file 'debian/changelog'
--- a/debian/changelog	2019-11-18 19:55:32 +0000
+++ b/debian/changelog	2019-12-20 21:41:42 +0000
@@ -1,8 +1,18 @@
 apt-cacher-ng (3.3-3) UNRELEASED; urgency=medium
 
+  [ Eduard Bloch ]
   * Dropped ancient pidof check from the init script (no bug here but there
     was some complaint on debian-devel a while ago)
 
+  [ Debian Janitor ]
+  * Trim trailing whitespace.
+  * Drop custom source compression.
+  * Use secure URI in Homepage field.
+  * Bump debhelper from old 9 to 12.
+  * Set debhelper-compat version in Build-Depends.
+  * Drop unnecessary dh arguments: --parallel
+  * Rely on pre-initialized dpkg-architecture variables.
+
  -- Eduard Bloch <blade@debian.org>  Mon, 18 Nov 2019 20:53:56 +0100
 
 apt-cacher-ng (3.3-2) unstable; urgency=low
@@ -370,7 +380,7 @@
 
 apt-cacher-ng (0.8.0~rc3-1) unstable; urgency=low
 
-  * New upstream version, first Sid upload of 0.8.x 
+  * New upstream version, first Sid upload of 0.8.x
     + systemd related changes: startup notification, restart on crashes
       (closes: #752255)
     + Now really fixes lookup of .default files in the resource directory
@@ -473,7 +483,7 @@
   * Review of maintainer scripts, now responsive to modification of
     CacheDir in existing configuration file(s)
   * Defensive behavior of Debconf integration (closes: #732606) and including
-    NEWS.Debian to explain the extended config handling 
+    NEWS.Debian to explain the extended config handling
   * added libssl-dev to build dependencies (now really closes: #729508)
   * fixing build failure on architectures where ancgfs is not built (i.e. Hurd)
   * Debconf description improvement in better German translation
@@ -486,7 +496,7 @@
     + fixes reading of certain .xz files (closes: #729941, #731804)
     + HTTPS support (closes: #729508)
   * more debconf controlled settings injected through a separate config
-    file, partially based on the patch from 
+    file, partially based on the patch from
     Geert Stappers <stappers@stappers.nl> (closes: #726656)
   * policy version bump, and no longer recommending perl, there are enough
     functionality replacements implemented to work with just perl-base
@@ -668,7 +678,7 @@
 
 apt-cacher-ng (0.7.4-1) unstable; urgency=medium
 
-  * New upstream release 
+  * New upstream release
     + prevents endless looping in certain situations (LP: #999915)
     + more tolerance to unstable connections and behavior fix for conflicting
       downloads in maintenance mode (closes: #672801)
@@ -969,7 +979,7 @@
 
 apt-cacher-ng (0.4.9-2) unstable; urgency=low
 
-  * Minor change to support Ubuntu release notes delivery with GET 
+  * Minor change to support Ubuntu release notes delivery with GET
     parameters (closes: #588662)
 
  -- Eduard Bloch <blade@debian.org>  Sun, 11 Jul 2010 11:06:49 +0200
@@ -995,7 +1005,7 @@
 
 apt-cacher-ng (0.4.7-1) unstable; urgency=low
 
-  * New upstream version 
+  * New upstream version
     + supports fallback backends descriptions which are used when the file is
       specified in the config but not configured properly. Intended to help
       in a heterogeneous Debian/Ubuntu environment (closes Ubuntu tasks
@@ -1020,7 +1030,7 @@
 
   * New upstream release
     + documented DnsCacheSeconds (Ubuntu bug 530524)
-    + Added simple implementation of SOAP request forwarding for PTS 
+    + Added simple implementation of SOAP request forwarding for PTS
       access (closes: #453277)
     + Typo fix in userinfo.html (closes: #572171)
 
@@ -1080,7 +1090,7 @@
     + passing HTTP redirection target through to user (closes: #556234)
   * Unconfuse crontab expiration script when BindAdress contains multiple
     entries (patch by Hellekin O\. Wolf, closes: #554707)
- 
+
  -- Eduard Bloch <blade@debian.org>  Sun, 22 Nov 2009 19:06:32 +0100
 
 apt-cacher-ng (0.4-1) unstable; urgency=low
@@ -1481,4 +1491,3 @@
   * Initial release (Closes: #447514), going to experimental for first testing
 
  -- Eduard Bloch <blade@debian.org>  Thu, 01 Nov 2007 18:22:27 +0100
-

=== removed file 'debian/compat'
--- a/debian/compat	2014-05-03 19:22:18 +0000
+++ b/debian/compat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-9

=== modified file 'debian/control'
--- a/debian/control	2019-11-10 18:45:23 +0000
+++ b/debian/control	2019-12-20 21:40:57 +0000
@@ -2,9 +2,9 @@
 Section: net
 Priority: optional
 Maintainer: Eduard Bloch <blade@debian.org>
-Build-Depends: debhelper (>= 9), cmake (>= 2.6.2), libbz2-dev, zlib1g-dev, liblzma-dev, libfuse-dev [!hurd-i386], pkg-config, libwrap0-dev, lsb-base (>> 3.0-6), debhelper (>= 9.20160709) | dh-systemd (>= 1.5), po-debconf, libssl-dev, libsystemd-dev (>= 210) [linux-any] | libsystemd-daemon-dev [linux-any], libpthread-stubs0-dev, libevent-dev
+Build-Depends: debhelper-compat (= 12), cmake (>= 2.6.2), libbz2-dev, zlib1g-dev, liblzma-dev, libfuse-dev [!hurd-i386], pkg-config, libwrap0-dev, lsb-base (>> 3.0-6), po-debconf, libssl-dev, libsystemd-dev (>= 210) [linux-any] | libsystemd-daemon-dev [linux-any], libpthread-stubs0-dev, libevent-dev
 Standards-Version: 4.1.1
-Homepage: http://www.unix-ag.uni-kl.de/~bloch/acng/
+Homepage: https://www.unix-ag.uni-kl.de/~bloch/acng/
 Vcs-Git: https://salsa.debian.org/blade/apt-cacher-ng.git
 Vcs-Browser: https://salsa.debian.org/blade/apt-cacher-ng/tree/debian/sid
 

=== modified file 'debian/rules'
--- a/debian/rules	2019-11-10 16:34:55 +0000
+++ b/debian/rules	2019-12-20 21:41:42 +0000
@@ -11,7 +11,7 @@
 CFLAGS += $(CPPFLAGS)
 CXXFLAGS += $(CPPFLAGS)
 
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+include /usr/share/dpkg/architecture.mk
 
 # libatomic provides 8-bytes atomic operation for 32-bit MIPS
 ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel))
@@ -19,7 +19,7 @@
 endif
 
 %:
-	dh $@ --parallel --with systemd
+	dh $@
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DSDINSTALL=on -DACNG_CACHE_DIR=/var/cache/apt-cacher-ng -DACNG_LOG_DIR=/var/log/apt-cacher-ng -DUSE_LTO=off $(EXTRA_LIBS)
@@ -37,7 +37,7 @@
 	test -r debian/apt-cacher-ng/etc/apt-cacher-ng/backends_ubuntu.default || mv debian/apt-cacher-ng/usr/lib/apt-cacher-ng/backends_ubuntu.default debian/apt-cacher-ng/etc/apt-cacher-ng/
 
 override_dh_installinit:
-	dh_installinit --no-restart-on-upgrade --restart-after-upgrade -- defaults 18
+	dh_installinit --no-stop-on-upgrade --restart-after-upgrade -- defaults 18
 
 override_dh_compress:
 	dh_compress -X.pdf

=== modified file 'debian/source/options'
--- a/debian/source/options	2015-03-31 17:04:07 +0000
+++ b/debian/source/options	2019-12-20 21:39:53 +0000
@@ -1,3 +1,2 @@
-compression=xz
 single-debian-patch
 auto-commit

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/21/f1decd548956f6fea01cf71cf6d6c4add0b92b.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/36/94e92e277ff5690755168664f8d644dc78c852.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/3c/c3caa4636738d4a3a37fdf8d1b67dbc2de57e6.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/ca/6586e0a1c8b4b7734a7033094a3ff31d64e6c4.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/d1/7aec1390552dfe016bddca5ef2846533df8e4c.debug
-rw-r--r--  root/root   /usr/lib/debug/.dwz/x86_64-linux-gnu/apt-cacher-ng.debug

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/lib/debug/.build-id/2e/ef04403baa07d21fb1e1a043b772ee3761f285.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/71/f26daa368c3cad445cad28d6d745fb02b0b787.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/7d/a882c15f58fde113b939a6f98aa6635cc2b0d3.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/88/6f6a8e1a7027731973b3b0e81085c4fb17197d.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/fe/85806c1771cacb6219262d2b97fa337efd4bca.debug

Control files of package apt-cacher-ng: lines which differ (wdiff format)

  • Depends: libbz2-1.0, libc6 (>= 2.28), libevent-2.1-7 (>= 2.1.8-stable), libevent-pthreads-2.1-7 (>= 2.1.8-stable), libgcc1 (>= 1:3.0), liblzma5 (>= 5.1.1alpha+20120614), libssl1.1 (>= 1.1.0), libstdc++6 (>= 7), 6), libsystemd0 (>= 210), libwrap0 (>= 7.6-4~), zlib1g (>= 1:1.2.0), debconf (>= 0.5) | debconf-2.0, adduser, lsb-base (>= 3.0-6)
  • Homepage: http://www.unix-ag.uni-kl.de/~bloch/acng/ https://www.unix-ag.uni-kl.de/~bloch/acng/

Control files of package apt-cacher-ng-dbgsym: lines which differ (wdiff format)

  • Build-Ids: 2eef04403baa07d21fb1e1a043b772ee3761f285 71f26daa368c3cad445cad28d6d745fb02b0b787 7da882c15f58fde113b939a6f98aa6635cc2b0d3 886f6a8e1a7027731973b3b0e81085c4fb17197d fe85806c1771cacb6219262d2b97fa337efd4bca 21f1decd548956f6fea01cf71cf6d6c4add0b92b 3694e92e277ff5690755168664f8d644dc78c852 3cc3caa4636738d4a3a37fdf8d1b67dbc2de57e6 ca6586e0a1c8b4b7734a7033094a3ff31d64e6c4 d17aec1390552dfe016bddca5ef2846533df8e4c

Run locally

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

debcheckout apt-cacher-ng
cd apt-cacher-ng
lintian-brush

More details

Full run details