Merge tag 'debian/14.5.2+ds1-3' into bullseye-fasttrack

gitlab Debian release 14.5.2+ds1-3
This commit is contained in:
Pirate Praveen 2021-12-17 00:53:35 +05:30
commit 2c955869e2
8 changed files with 28 additions and 13 deletions

16
debian/changelog vendored
View file

@ -1,3 +1,19 @@
gitlab (14.5.2+ds1-3) experimental; urgency=medium
* Rename debian/maintscript to debian/gitlab.mainscript
* Add debhelper templates to preinst (fixes the removing obsolete
conffile). Thanks to Nilesh Patra for helping troubleshoot.
-- Pirate Praveen <praveen@debian.org> Fri, 17 Dec 2021 00:17:59 +0530
gitlab (14.5.2+ds1-2) experimental; urgency=medium
* Fix path in maintscript
* Drop compat file, rely on debhelper-compat and bump compat level to 13
* Adapt for debhelper compat 13
-- Pirate Praveen <praveen@debian.org> Thu, 16 Dec 2021 11:07:42 +0530
gitlab (14.5.2+ds1-1~fto11+1) bullseye-fasttrack; urgency=medium
* Rebuild for bullseye-fasttrack.

1
debian/compat vendored
View file

@ -1 +0,0 @@
10

2
debian/control vendored
View file

@ -7,7 +7,7 @@ Uploaders: Cédric Boutillier <boutil@debian.org>,
Balasankar C <balasankarc@autistici.org>,
Sruthi Chandran <srud@debian.org>,
Utkarsh Gupta <utkarsh@debian.org>
Build-Depends: debhelper (>= 10~),
Build-Depends: debhelper-compat (= 13),
gem2deb,
dh-golang,
golang-any (>= 2:1.17~),

View file

@ -1 +1 @@
_build/bin usr
debian/tmp/usr/bin

View file

@ -315,4 +315,4 @@ rm_conffile /etc/gitlab/initializers/labkit_middleware.rb 13.12.9+ds1-3 gitlab
rm_conffile /etc/gitlab/initializers/mailer_retries.rb 13.12.9+ds1-3 gitlab
rm_conffile /etc/gitlab/initializers/transaction_metrics.rb 14.1.7+ds1-2 gitlab
rm_conffile /etc/gitlab/feature_flags/development/additional_snowplow_tracking.yml 14.4.4+ds1-1 gitlab
rm_conffile /etc/gitlab/feature_flags/block_anonymous_global_searches.yml 14.4.4+ds1-1 gitlab
rm_conffile /etc/gitlab/feature_flags/development/block_anonymous_global_searches.yml 14.4.4+ds1-1 gitlab

View file

@ -12,3 +12,5 @@ if [ "${pg_version}" -lt 12 ]; then
echo "========================================================================"
exit 1
fi
#DEBHELPER#

1
debian/not-installed vendored Normal file
View file

@ -0,0 +1 @@
usr/share/gocode

15
debian/rules vendored
View file

@ -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