Lintian Fixes - graphite-carbon

Ready changes

Merge these changes:

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

Summary

Diff

=== modified file 'debian/carbon-aggregator@.service'
--- a/debian/carbon-aggregator@.service	2017-09-19 10:24:27 +0000
+++ b/debian/carbon-aggregator@.service	2020-06-04 10:48:03 +0000
@@ -7,8 +7,8 @@
 Type=forking
 StandardOutput=syslog
 StandardError=syslog
-ExecStart=/usr/bin/carbon-aggregator --config=/etc/carbon/carbon.conf --instance %i --pidfile=/var/run/carbon-aggregator-%i.pid --logdir=/var/log/carbon/ start
-PIDFile=/var/run/carbon-aggregator-%i.pid
+ExecStart=/usr/bin/carbon-aggregator --config=/etc/carbon/carbon.conf --instance %i --pidfile=/run/carbon-aggregator-%i.pid --logdir=/var/log/carbon/ start
+PIDFile=/run/carbon-aggregator-%i.pid
 
 [Install]
 WantedBy=multi-user.target

=== modified file 'debian/carbon-cache.service'
--- a/debian/carbon-cache.service	2017-09-19 10:24:27 +0000
+++ b/debian/carbon-cache.service	2020-06-04 10:48:03 +0000
@@ -7,8 +7,8 @@
 Type=forking
 StandardOutput=syslog
 StandardError=syslog
-ExecStart=/usr/bin/carbon-cache --config=/etc/carbon/carbon.conf --pidfile=/var/run/carbon-cache.pid --logdir=/var/log/carbon/ start
-PIDFile=/var/run/carbon-cache.pid
+ExecStart=/usr/bin/carbon-cache --config=/etc/carbon/carbon.conf --pidfile=/run/carbon-cache.pid --logdir=/var/log/carbon/ start
+PIDFile=/run/carbon-cache.pid
 
 [Install]
 WantedBy=multi-user.target

=== modified file 'debian/carbon-relay@.service'
--- a/debian/carbon-relay@.service	2017-09-19 10:24:27 +0000
+++ b/debian/carbon-relay@.service	2020-06-04 10:48:03 +0000
@@ -7,8 +7,8 @@
 Type=forking
 StandardOutput=syslog
 StandardError=syslog
-ExecStart=/usr/bin/carbon-relay --config=/etc/carbon/carbon.conf --instance %i --pidfile=/var/run/carbon-relay-%i.pid --logdir=/var/log/carbon/ start
-PIDFile=/var/run/carbon-relay-%i.pid
+ExecStart=/usr/bin/carbon-relay --config=/etc/carbon/carbon.conf --instance %i --pidfile=/run/carbon-relay-%i.pid --logdir=/var/log/carbon/ start
+PIDFile=/run/carbon-relay-%i.pid
 
 [Install]
 WantedBy=multi-user.target

=== modified file 'debian/changelog'
--- a/debian/changelog	2018-12-12 10:07:21 +0000
+++ b/debian/changelog	2020-06-04 10:48:44 +0000
@@ -1,3 +1,16 @@
+graphite-carbon (1.1.4-2) UNRELEASED; urgency=low
+
+  * Use secure copyright file specification URI.
+  * Bump debhelper from old 10 to 12.
+    + Use dh_installsystemd rather than deprecated dh_systemd_enable.
+    + Use dh_installsystemd rather than deprecated dh_systemd_start.
+  * Set debhelper-compat version in Build-Depends.
+  * Replace /var/run with /run for the Service PIDFile.
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
+    Repository-Browse.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Thu, 04 Jun 2020 10:45:49 -0000
+
 graphite-carbon (1.1.4-1) unstable; urgency=medium
 
   * New upstream release.

=== removed file 'debian/compat'
--- a/debian/compat	2018-12-12 09:59:49 +0000
+++ b/debian/compat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-10

=== modified file 'debian/control'
--- a/debian/control	2018-12-12 10:06:44 +0000
+++ b/debian/control	2020-06-04 10:47:23 +0000
@@ -6,7 +6,7 @@
  Jonas Genannt <genannt@debian.org>,
  Thomas Goirand <zigo@debian.org>,
 Build-Depends:
- debhelper (>= 10),
+ debhelper-compat (= 12),
  dh-python,
  python3-all,
  rename,

=== modified file 'debian/copyright'
--- a/debian/copyright	2012-12-17 16:33:06 +0000
+++ b/debian/copyright	2020-06-04 10:46:05 +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-Contact: Chris Davis <chrismd@gmail.com>
 Source: http://pypi.python.org/pypi/carbon/
 Upstream-Name: Carbon

=== modified file 'debian/rules'
--- a/debian/rules	2018-12-12 09:59:49 +0000
+++ b/debian/rules	2020-06-04 10:46:43 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with python3,systemd
+	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_auto_clean:
 	echo "Do nothing..."
@@ -32,14 +32,14 @@
 override_dh_installinit:
 	dh_installinit --name=carbon-cache
 
-override_dh_systemd_start:
-	dh_systemd_start --name=carbon-cache
+override_dh_installsystemd:
+	dh_installsystemd --name=carbon-cache
 
-override_dh_systemd_enable:
-	dh_systemd_enable --name=carbon-cache
-	dh_systemd_enable --name=carbon-relay@ --no-enable
-	dh_systemd_enable --name=carbon-aggregator@ --no-enable
+override_dh_installsystemd:
+	dh_installsystemd --name=carbon-cache
+	dh_installsystemd --name=carbon-relay@ --no-enable
+	dh_installsystemd --name=carbon-aggregator@ --no-enable
 
 override_dh_python3:
 	dh_python3 --shebang=/usr/bin/python3
-	
\ No newline at end of file
+	

=== added directory 'debian/upstream'
=== added file 'debian/upstream/metadata'
--- a/debian/upstream/metadata	1970-01-01 00:00:00 +0000
+++ b/debian/upstream/metadata	2020-06-04 10:48:44 +0000
@@ -0,0 +1,5 @@
+---
+Bug-Database: https://github.com/graphite-project/carbon/issues
+Bug-Submit: https://github.com/graphite-project/carbon/issues/new
+Repository: https://github.com/graphite-project/carbon.git
+Repository-Browse: https://github.com/graphite-project/carbon

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/share/doc/graphite-carbon/examples/carbon.conf.example

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/share/doc/graphite-carbon/examples/carbon.conf.example.gz

No differences were encountered in the control files

Run locally

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

debcheckout graphite-carbon
cd graphite-carbon
lintian-brush

More details

Full run details