Merge lp:~debian-janitor/squid-deb-proxy/lintian-fixes into lp:squid-deb-proxy

[Debian Janitor]

Fix lintian issues: Replace XC-Package-Type with Package-Type., Set debhelper-compat version in Build-Depends., Trim trailing whitespace., Update standards version to 4.4.1, no changes needed., Use versioned copyright format URI.

Fix some issues reported by lintian
* Trim trailing whitespace. (file-contains-trailing-whitespace)
* Use versioned copyright format URI. (unversioned-copyright-format-uri)
* Set debhelper-compat version in Build-Depends. (uses-debhelper-compat-file)
* Replace XC-Package-Type with Package-Type. (xc-package-type-in-debian-control)
* Update standards version to 4.4.1, no changes needed. (out-of-date-standards-version)

This merge proposal was created automatically by the Janitor bot.
For more information, including instructions on how to disable
these merge proposals, see https://janitor.debian.net/lintian-fixes.

You can follow up to this merge proposal as you normally would.

Build and test logs for this branch can be found at
https://janitor.debian.net/lintian-fixes/pkg/squid-deb-proxy/a756144e-9a10-439b-b146-3f9cf837646f.

These changes have no impact on the binary debdiff. See
https://janitor.debian.net/api/run/a756144e-9a10-439b-b146-3f9cf837646f/debdiff?filter_boring=1 to
download the raw debdiff.

You can also view the diffoscope diff at
https://janitor.debian.net/api/run/a756144e-9a10-439b-b146-3f9cf837646f/diffoscope?filter_boring=1,
or unfiltered at https://janitor.debian.net/api/run/a756144e-9a10-439b-b146-3f9cf837646f/diffoscope.

Unmerged revisions

155. By Debian Janitor on 2020-05-06

Update standards version to 4.4.1, no changes needed.

Fixes: lintian: out-of-date-standards-version
See-also: https://lintian.debian.org/tags/out-of-date-standards-version.html

154. By Debian Janitor on 2020-05-06

Replace XC-Package-Type with Package-Type.

Fixes: lintian: xc-package-type-in-debian-control
See-also: https://lintian.debian.org/tags/xc-package-type-in-debian-control.html

153. By Debian Janitor on 2020-05-06

Set debhelper-compat version in Build-Depends.

Fixes: lintian: uses-debhelper-compat-file
See-also: https://lintian.debian.org/tags/uses-debhelper-compat-file.html

152. By Debian Janitor on 2020-05-06

Use versioned copyright format URI.

Fixes: lintian: unversioned-copyright-format-uri
See-also: https://lintian.debian.org/tags/unversioned-copyright-format-uri.html

151. By Debian Janitor on 2020-05-06

Trim trailing whitespace.

Fixes: lintian: file-contains-trailing-whitespace
See-also: https://lintian.debian.org/tags/file-contains-trailing-whitespace.html

=== modified file 'debian/changelog'
--- debian/changelog	2020-01-18 18:01:14 +0000
+++ debian/changelog	2020-05-06 11:48:18 +0000
@@ -1,3 +1,13 @@
+squid-deb-proxy (0.8.16) UNRELEASED; urgency=medium
+
+  * Trim trailing whitespace.
+  * Use versioned copyright format URI.
+  * Set debhelper-compat version in Build-Depends.
+  * Replace XC-Package-Type with Package-Type.
+  * Update standards version to 4.4.1, no changes needed.
+
+ -- Debian Janitor <[e-mail]>  Wed, 06 May 2020 05:36:52 +0000
+
 squid-deb-proxy (0.8.15) unstable; urgency=medium
 
   [ Graham Cantin ]
@@ -57,7 +67,7 @@
 
   [ Vagrant Cascadian ]
   * add /etc/resolvconf/update-libc.d/squid-deb-proxy (closes: #780083)
-  
+
   [ Robie Basak ]
   * Simplify upstart "start on" to match squid3, to fix runlevel
     transition problem (LP: #1456662)
@@ -70,9 +80,9 @@
   * debian/po/nl.po:
     - add Dutch translation of squid-deb-proxy debconf messages,
       thanks to Frans Spiesschaert (closes: 766519)
-  
+
   [ Chris Glass ]
-  * Don't remove the package blacklist file if it is empty when 
+  * Don't remove the package blacklist file if it is empty when
     gathering rules. This should fix LP: #1166667 (closes: #775545)
 
  -- Michael Vogt <[e-mail]>  Thu, 29 Jan 2015 15:50:49 +0100
@@ -83,9 +93,9 @@
   * squid-deb-proxy.conf:
     - add refresh patterns for tar.xz,tar.bz2 (closes: #756357)
     - use squid-deb-proxy specific netdb_filename (closes: #760666)
-  
+
   [ Michael Vogt ]
-  * improve README to explain better how to use it when 
+  * improve README to explain better how to use it when
     squid-deb-proxy-client is not a option
 
  -- Michael Vogt <[e-mail]>  Wed, 10 Sep 2014 16:07:07 +0200
@@ -94,10 +104,10 @@
 
   [ Vagrant Cascadian ]
   * remove unowned files on purge (closes: #705995)
-  
+
   [ Chris Glass ]
   * lp:~tribaal/squid-deb-proxy/refresh-ims:
-    - add "refresh-ims" options to the refresh patterns for the 
+    - add "refresh-ims" options to the refresh patterns for the
       index files
 
  -- Michael Vogt <[e-mail]>  Fri, 18 Jul 2014 13:25:47 +0200
@@ -119,9 +129,9 @@
   * ensure /etc/avahi/services/squid-deb-proxy.service is removed
     on package removal
   * debian/po/es.po:
-    - New Spanish debconf translation, thanks to Camaleón 
+    - New Spanish debconf translation, thanks to Camaleón
       (closes: #733495)
-  
+
   [ Chris Glass ]
   * lp:~tribaal/squid-deb-proxy/extra-default-networks:
     - add two more example repos
@@ -182,7 +192,7 @@
   [ Andrew Simpson ]
   * debian/squid-deb-proxy.init:
     - fix incorrect functions in reload() (closes: #720365)
-  
+
   [ Michael Vogt ]
   * apt-avahi-discover:
     - when a _apt_proxy._tcp server is found, try to connect to
@@ -190,10 +200,10 @@
     - when multiple _apt_proxy._tcp servers are found, use the one
       that provides the quickest answer (closes: #722253, #718788)
     Thanks to Paul Wise and Julian Andres Klode for the suggestions
-  
+
   [ Julian Andres Klode ]
   * apt-avahi-discover:
-    - Pass -f to avahi-browse to not produce error messages if it cannot 
+    - Pass -f to avahi-browse to not produce error messages if it cannot
       find a service (closes: #722253)
 
  -- Michael Vogt <[e-mail]>  Tue, 10 Sep 2013 16:15:53 +0200
@@ -201,7 +211,7 @@
 squid-deb-proxy (0.7.2) unstable; urgency=low
 
   [ Chris J Arges ]
-  * Add additional ipv6 localhost address. (LP: #1195430) 
+  * Add additional ipv6 localhost address. (LP: #1195430)
 
  -- Michael Vogt <[e-mail]>  Tue, 09 Jul 2013 16:37:19 +0200
 
@@ -234,7 +244,7 @@
     - added, thanks to "jean-pierre giraud" (closes: #711140)
   * debian/po/sv.po:
     - added, thanks to "Martin Bagge" (closes: #712652)
-  
+
  -- Michael Vogt <[e-mail]>  Tue, 18 Jun 2013 13:33:41 +0200
 
 squid-deb-proxy (0.7) unstable; urgency=low
@@ -256,7 +266,7 @@
 squid-deb-proxy (0.6.7) raring; urgency=low
 
   * lp:~nobuto/squid-deb-proxy/allow-ubuntu-cloud-archive:
-    - allowing caching of the "Ubuntu Cloud Archive" repository by 
+    - allowing caching of the "Ubuntu Cloud Archive" repository by
       default
   * allow caching of .extras.ubuntu.com
 
@@ -275,7 +285,7 @@
   * lp:~sdeziel/squid-deb-proxy/remove-unused-acls:
     - remove all and localhost acls as they are buildin in squid3
       (LP: #1005257)
-  
+
   [ Michael Vogt ]
   * debian/control:
     - only depend on squid3
@@ -307,7 +317,7 @@
   [ Michael Vogt ]
   * mirror-dstdomain.acl:
     - fix typo, thanks to Paolo Rotolo (LP: #978696)
-  
+
  -- Michael Vogt <[e-mail]>  Thu, 19 Apr 2012 14:46:24 +0200
 
 squid-deb-proxy (0.6.2) precise; urgency=low
@@ -340,7 +350,7 @@
 
 squid-deb-proxy (0.5.2) oneiric; urgency=low
 
-  * Rework/simplify/fix the udeb based on the input from 
+  * Rework/simplify/fix the udeb based on the input from
     Colin Watson (thanks a lot!)
   * fix a bunch of lintian errors:
     - add missing po-debconf as build-depends
@@ -365,8 +375,8 @@
      - allowed-networks-src.acl.d
      - mirror-dstdomain.acl.d
      - pkg-blacklist.d
-  * add squid-deb-proxy-client udeb 
-  * write debconf generated config to 
+  * add squid-deb-proxy-client udeb
+  * write debconf generated config to
      /etc/squid-deb-proxy/allowed-networks-src.acl.d/30-debconf
      /etc/squid-deb-proxy/mirror-dstdomain.acl.d/30-debconf
   * debian/control:
@@ -423,23 +433,23 @@
   * Adjusting upstart job so restarting squid-deb-proxy does not result
     in killing squid-deb-proxy-avahi. (LP: #677276)
   * Also adjusting upstart job so squid-deb-proxy does not get started
-    a real network interface is up and all local filesystems are mounted 
+    a real network interface is up and all local filesystems are mounted
 
  -- Clint Byrum <[e-mail]>  Thu, 18 Nov 2010 16:27:24 -0800
 
 squid-deb-proxy (0.3.2) natty; urgency=low
 
   [ Colin Dean ]
-  * adding other ubuntu/canonical repos and some suggested 
+  * adding other ubuntu/canonical repos and some suggested
     others (but commented) (LP: #673080)
-  * Added commented lines which allow non-specified domains to be 
+  * Added commented lines which allow non-specified domains to be
     accessed and (optionally) cached
 
   [ Jorge O. Castro ]
   * Add some popular repositories to cache (commented out)
-  
+
   [ Michael Vogt ]
-  * README: 
+  * README:
     - updated to document the new options
   * debian/squid-deb-proxy.squid-deb-proxy-avahi.upstart:
     - fix upstart script so that the avahi service actually gets
@@ -464,7 +474,7 @@
   * debian/control:
     - add recommends on avahi-utils to get avahi-publish
   * apt-avahi-discover:
-    - provide a avahi based module suitable for apts 
+    - provide a avahi based module suitable for apts
       Acquire::http::ProxyAutoDetect option
   * 30autoproxy:
     - add apt configuration that automatically uses apt-avahi-discover
@@ -499,7 +509,7 @@
   * README:
     - add documentation
   * *.acl:
-    - split the bits that the user will most likely change into 
+    - split the bits that the user will most likely change into
       different files
 
  -- Michael Vogt <[e-mail]>  Mon, 25 Jan 2010 18:13:15 +0100

=== removed file 'debian/compat'
=== modified file 'debian/control'
--- debian/control	2020-01-10 10:17:01 +0000
+++ debian/control	2020-05-06 11:48:18 +0000
@@ -2,12 +2,12 @@
 Section: net
 Priority: optional
 Maintainer: Michael Vogt <[e-mail]>
-Build-Depends: debhelper (>= 12),
+Build-Depends: debhelper-compat (= 12),
                gettext,
                intltool,
                pkg-config,
                po-debconf
-Standards-Version: 4.4.0
+Standards-Version: 4.4.1
 Vcs-Bzr: https://code.launchpad.net/~squid-deb-proxy-developers/squid-deb-proxy/trunk
 Homepage: https://launchpad.net/squid-deb-proxy
 
@@ -38,7 +38,7 @@
  that publishes the service as _apt_proxy._tcp.
 
 Package: squid-deb-proxy-client-udeb
-XC-Package-Type: udeb
+Package-Type: udeb
 Section: debian-installer
 Architecture: all
 Depends: configured-network,

=== modified file 'debian/copyright'
--- debian/copyright	2020-01-10 10:03:04 +0000
+++ debian/copyright	2020-05-06 11:48:18 +0000
@@ -1,4 +1,4 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=59
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
 Copyright: (c) 2010 Canonical