Lintian Fixes - graphite-carbon
Ready changes
Summary
- Use secure copyright file specification URI. ( insecure-copyright-format-uri )
- Bump debhelper from old 10 to 13. ( package-uses-old-debhelper-compat-version )
- Set debhelper-compat version in Build-Depends. ( uses-debhelper-compat-file )
- Replace /var/run with /run for the Service PIDFile. ( systemd-service-file-refers-to-var-run )
- Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, Repository-Browse. ( upstream-metadata-file-is-missing , upstream-metadata-missing-bug-tracking , upstream-metadata-missing-repository )
Lintian Result
Diff
diff --git a/debian/carbon-aggregator@.service b/debian/carbon-aggregator@.service
index 56fda7c..15e26aa 100644
--- a/debian/carbon-aggregator@.service
+++ b/debian/carbon-aggregator@.service
@@ -7,8 +7,8 @@ Documentation=https://graphite.readthedocs.io
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
diff --git a/debian/carbon-cache.service b/debian/carbon-cache.service
index 55464dd..484f32c 100644
--- a/debian/carbon-cache.service
+++ b/debian/carbon-cache.service
@@ -7,8 +7,8 @@ Documentation=https://graphite.readthedocs.io
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
diff --git a/debian/carbon-relay@.service b/debian/carbon-relay@.service
index 74506e9..85556f7 100644
--- a/debian/carbon-relay@.service
+++ b/debian/carbon-relay@.service
@@ -7,8 +7,8 @@ Documentation=https://graphite.readthedocs.io
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
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 2ce7e5c..7001ba8 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
Jonas Genannt <genannt@debian.org>,
Thomas Goirand <zigo@debian.org>,
Build-Depends:
- debhelper (>= 10),
+ debhelper-compat (= 13),
dh-python,
python3-all,
rename,
diff --git a/debian/copyright b/debian/copyright
index 491cd63..3549ff8 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-Contact: Chris Davis <chrismd@gmail.com>
Source: http://pypi.python.org/pypi/carbon/
Upstream-Name: Carbon
diff --git a/debian/rules b/debian/rules
index 09805ca..91e769c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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_install:
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
+
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..84b3bbf
--- /dev/null
+++ b/debian/upstream/metadata
@@ -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 -rwxr-xr-x root/root DEBIAN/preinst
No differences were encountered in the control files