Skip to content

[master] Update "deb" packaging to use "dh_installsystemd", and remove upstart script#914

Merged
neersighted merged 1 commit intodocker:masterfrom
thaJeztah:debhelper_update_take_2
Jul 21, 2023
Merged

[master] Update "deb" packaging to use "dh_installsystemd", and remove upstart script#914
neersighted merged 1 commit intodocker:masterfrom
thaJeztah:debhelper_update_take_2

Conversation

@thaJeztah thaJeztah requested review from neersighted and tianon June 21, 2023 21:51
@thaJeztah thaJeztah force-pushed the debhelper_update_take_2 branch from 2b87537 to fb8e299 Compare June 21, 2023 22:04
Copy link
Copy Markdown
Contributor

@tianon tianon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally I like the shape, just a few suggestions ❤️

Comment thread deb/common/docker-ce.docker.service Outdated
Comment thread deb/common/docker-ce.docker.socket Outdated
Comment thread deb/common/docker-ce.maintscript Outdated
Copy link
Copy Markdown
Member

@neersighted neersighted left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with @tianon's tweaks

@neersighted neersighted force-pushed the debhelper_update_take_2 branch from fb8e299 to 29682a9 Compare July 20, 2023 21:12
@neersighted
Copy link
Copy Markdown
Member

Applied the review comments; @tianon @thaJeztah PTAL

Copy link
Copy Markdown
Contributor

@tianon tianon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

very close 🙈 ❤️

Comment thread deb/common/docker-ce.docker.service Outdated
Comment thread deb/common/docker-ce.docker.socket Outdated
Comment thread deb/common/docker-ce.maintscript Outdated
This reverts commit cafc21c.

This also removes the now-obsolete upstart script and updates the
"debhelper compat level" to 12 (which necessitates adding "override_dh_dwz"
-- safe to remove once we can update to debhelper-compat 13+).

(See also https://lists.debian.org/debian-devel-announce/2020/02/msg00000.html)

Signed-off-by: Tianon Gravi <admwiggin@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
Copy link
Copy Markdown
Contributor

@tianon tianon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically the -1 is unnecessarily specific, but should be harmless. LGTM 👍 ❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants