From 366b53f1d7202a48a1dd7a789243f1e812a6f9fe Mon Sep 17 00:00:00 2001 From: Mohammed Bilal Date: Fri, 13 Jan 2023 21:23:19 +0530 Subject: [PATCH] symlink more modules from gitaly some modules which were vendored previously are now vendored along with new gitaly 15.6.4 --- debian/control | 4 +--- debian/rules | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 82e9beb358..4f23fa40be 100644 --- a/debian/control +++ b/debian/control @@ -66,9 +66,7 @@ Build-Depends: debhelper-compat (= 13), golang-websocket-dev, # protobuf-1-5 # golang-google-grpc-dev (>= 1.38~), - libimage-exiftool-perl, - golang-github-kylelemons-godebug-dev, - golang-github-cli-browser-dev + libimage-exiftool-perl Standards-Version: 4.6.1 Vcs-Git: https://salsa.debian.org/ruby-team/gitlab.git Vcs-Browser: https://salsa.debian.org/ruby-team/gitlab diff --git a/debian/rules b/debian/rules index fbcf22e5cd..a4e4dd5a20 100755 --- a/debian/rules +++ b/debian/rules @@ -37,6 +37,10 @@ override_dh_auto_configure-arch: ln -s /usr/share/gocode/src/github.com/oklog/ulid ${BUILDDIR}/vendor/github.com/oklog/ulid/v2 mkdir -p ${BUILDDIR}/vendor/cloud.google.com ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/cloud.google.com/go ${BUILDDIR}/vendor/cloud.google.com + ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/gocloud.dev ${BUILDDIR}/vendor + ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/github.com/aws ${BUILDDIR}/vendor/github.com + ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/github.com/Azure ${BUILDDIR}/vendor/github.com + ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/github.com/AzureAD ${BUILDDIR}/vendor/github.com override_dh_auto_build-indep: dh_auto_build -O--package=gitlab -O--buildsystem=ruby -O--with=ruby