Skip to content

Commit

Permalink
tools: Prefer recent debhelper over obsolete dh-systemd (#7805)
Browse files Browse the repository at this point in the history
dh-systemd got absorbed into debhelper a while ago, and lintian now
starts to complain about the obsolete package:

    E: cockpit source: build-depends-on-obsolete-package build-depends: dh-systemd => use debhelper (>= 9.20160709)

Prefer a newer debhelper and don't install dh-systemd then, but keep it
as alternative build dependency for backportability to older
Debian/Ubuntu releases.

On older releases this will trigger a lintian error complaining about
the missing dh-systemd build dependency. Quiesce that.

This will fix the image rebuild in PR #7800.

Closes #7805
  • Loading branch information
martinpitt authored and stefwalter committed Oct 4, 2017
1 parent 76b620e commit 771104e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion tools/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Section: admin
Priority: optional
Maintainer: Cockpit <cockpit@cockpit-project.org>
Build-Depends: debhelper (>= 9.20141010),
dh-systemd,
debhelper (>= 9.20160709) | dh-systemd,
dpkg-dev (>= 1.17.14),
dh-autoreconf,
autoconf,
Expand Down
3 changes: 3 additions & 0 deletions tools/debian/source/lintian-overrides
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ cockpit source: source-is-missing dist/*.js*
cockpit source: source-is-missing pkg/kubernetes/scripts/test-images.js line length*
# pkg/machines/include is symlink to node_components/noVNC/include and content is meant as downloadable resource at runtime
cockpit source: source-is-missing pkg/machines/include/*
# We prefer a newer debhelper which merged dh-systemd
cockpit source: missing-build-dependency-for-dh_-command dh_systemd_start => dh-systemd
cockpit source: missing-build-dependency-for-dh-addon systemd => dh-systemd

0 comments on commit 771104e

Please sign in to comment.