From 86d44d376c0626538cd3d274a502fedcf60b226a Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Thu, 16 Dec 2021 22:37:33 +0530 Subject: [PATCH] Adapt for debhelper compat 13 --- debian/gitlab-workhorse.install | 2 +- debian/not-installed | 1 + debian/rules | 15 ++++++--------- 3 files changed, 8 insertions(+), 10 deletions(-) create mode 100644 debian/not-installed diff --git a/debian/gitlab-workhorse.install b/debian/gitlab-workhorse.install index 1a1cc70fd5..451ddc0d8e 100644 --- a/debian/gitlab-workhorse.install +++ b/debian/gitlab-workhorse.install @@ -1 +1 @@ -_build/bin usr +debian/tmp/usr/bin diff --git a/debian/not-installed b/debian/not-installed new file mode 100644 index 0000000000..a3da66ddd2 --- /dev/null +++ b/debian/not-installed @@ -0,0 +1 @@ +usr/share/gocode diff --git a/debian/rules b/debian/rules index f0996f5db1..d886fecfa4 100755 --- a/debian/rules +++ b/debian/rules @@ -36,12 +36,9 @@ override_dh_install: sed -i 's/__NEW_VERSION__/${DEB_VERSION}/g' debian/gitlab/usr/lib/gitlab/templates/gitlab-debian.conf.example dh_install -XLICENSE -O--package=gitlab-workhorse -override_dh_installinit: - dh_installinit --no-start -p gitlab --name=gitlab-sidekiq -O--package=gitlab - dh_installinit --no-start -p gitlab --name=gitlab-puma -O--package=gitlab - dh_installinit --no-start -p gitlab --name=gitlab-mailroom -O--package=gitlab - dh_installinit --no-start -p gitlab --name=gitlab-workhorse -O--package=gitlab - dh_installinit -O--package=gitlab - -override_dh_systemd_start: - dh_systemd_start --no-start -O--package=gitlab +override_dh_installsystemd: + dh_installsystemd --no-start -p gitlab --name=gitlab-sidekiq -O--package=gitlab + dh_installsystemd --no-start -p gitlab --name=gitlab-puma -O--package=gitlab + dh_installsystemd --no-start -p gitlab --name=gitlab-mailroom -O--package=gitlab + dh_installsystemd --no-start -p gitlab --name=gitlab-workhorse -O--package=gitlab + dh_installsystemd -O--package=gitlab