Vendor modules conflicting with golang-github-golang-protobuf-1-5-dev
This commit is contained in:
parent
b0e603a14e
commit
2fdfb5ba05
2 changed files with 32 additions and 11 deletions
30
debian/control
vendored
30
debian/control
vendored
|
@ -26,9 +26,11 @@ Build-Depends: debhelper-compat (= 13),
|
|||
golang-github-garyburd-redigo-dev,
|
||||
golang-github-golang-jwt-jwt-dev,
|
||||
golang-github-google-uuid-dev,
|
||||
golang-github-golang-protobuf-1-5-dev,
|
||||
golang-github-getsentry-raven-go-dev (>= 0.2~),
|
||||
golang-github-gomodule-redigo-dev,
|
||||
golang-github-grpc-ecosystem-go-grpc-prometheus-dev,
|
||||
# protobuf-1-5
|
||||
# golang-github-grpc-ecosystem-go-grpc-prometheus-dev,
|
||||
golang-github-hashicorp-yamux-dev (>= 0.0+git20210316.a95892c~),
|
||||
golang-github-jfbus-httprs-dev,
|
||||
golang-github-jtolds-gls-dev (>= 4.20~),
|
||||
|
@ -36,28 +38,34 @@ Build-Depends: debhelper-compat (= 13),
|
|||
golang-github-mitchellh-copystructure-dev,
|
||||
golang-github-mitchellh-reflectwalk-dev,
|
||||
golang-github-pmezard-go-difflib-dev,
|
||||
golang-github-prometheus-client-golang-dev,
|
||||
golang-github-prometheus-client-model-dev,
|
||||
golang-github-prometheus-common-dev,
|
||||
# protobuf-1-5
|
||||
# golang-github-prometheus-client-golang-dev,
|
||||
golang-github-cespare-xxhash-dev,
|
||||
# golang-github-prometheus-client-model-dev,
|
||||
# golang-github-prometheus-common-dev,
|
||||
golang-github-ryszard-goskiplist-dev,
|
||||
golang-github-sebest-xff-dev,
|
||||
golang-github-sirupsen-logrus-dev,
|
||||
golang-github-stretchr-testify-dev (>= 1.4~),
|
||||
golang-gitlab-gitlab-org-gitaly-dev (>= 15.4~),
|
||||
golang-gitlab-gitlab-org-gitaly-dev (>= 15.5~),
|
||||
golang-github-beevik-ntp-dev,
|
||||
golang-gitlab-gitlab-org-labkit-dev (>= 1.14~),
|
||||
golang-gocloud-dev,
|
||||
# protobuf-1-5
|
||||
# golang-gitlab-gitlab-org-labkit-dev (>= 1.14~),
|
||||
golang-github-oklog-ulid-dev,
|
||||
# golang-gocloud-dev,
|
||||
golang-golang-x-crypto-dev,
|
||||
golang-golang-x-net-dev,
|
||||
golang-golang-x-sys-dev (>= 0.0~git20180510.7dfd129~),
|
||||
golang-google-genproto-dev,
|
||||
golang-goprotobuf-dev (>= 1.4.3~),
|
||||
# protobuf-1-5
|
||||
# golang-google-genproto-dev,
|
||||
golang-honnef-go-tools-dev,
|
||||
golang-procfs-dev,
|
||||
golang-protobuf-extensions-dev,
|
||||
# protobuf-1-5
|
||||
# golang-protobuf-extensions-dev,
|
||||
golang-toml-dev,
|
||||
golang-websocket-dev,
|
||||
golang-google-grpc-dev (>= 1.38~),
|
||||
# protobuf-1-5
|
||||
# golang-google-grpc-dev (>= 1.38~),
|
||||
libimage-exiftool-perl
|
||||
Standards-Version: 4.6.1
|
||||
Vcs-Git: https://salsa.debian.org/ruby-team/gitlab.git
|
||||
|
|
13
debian/rules
vendored
13
debian/rules
vendored
|
@ -19,6 +19,19 @@ override_dh_auto_configure-arch:
|
|||
if [ -d ${BUILDDIR}/vendor ]; then ${RM} -rf ${BUILDDIR}/vendor; fi
|
||||
if [ -d ${BUILDDIR}/workhorse-vendor ]; then mv ${BUILDDIR}/workhorse-vendor \
|
||||
${BUILDDIR}/vendor; fi
|
||||
# temporary step till protobuf 1.5 vs 1.3 is resolved
|
||||
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/github.com/prometheus ${BUILDDIR}/vendor/github.com
|
||||
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/github.com/matttproud ${BUILDDIR}/vendor/github.com
|
||||
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/github.com/googleapis ${BUILDDIR}/vendor/github.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/go.opencensus.io ${BUILDDIR}/vendor
|
||||
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/google.golang.org ${BUILDDIR}/vendor
|
||||
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/gitlab.com/gitlab-org/labkit ${BUILDDIR}/vendor/gitlab.com/gitlab-org
|
||||
ln -s /usr/share/gocode/src/gitlab.com/gitlab-org/gitaly/v15/vendor/github.com/golang/groupcache ${BUILDDIR}/vendor/github.com/golang
|
||||
mkdir -p ${BUILDDIR}/vendor/github.com/cespare/xxhash
|
||||
ln -s /usr/share/gocode/src/github.com/cespare/xxhash ${BUILDDIR}/vendor/github.com/cespare/xxhash/v2
|
||||
mkdir -p ${BUILDDIR}/vendor/github.com/oklog/ulid
|
||||
ln -s /usr/share/gocode/src/github.com/oklog/ulid ${BUILDDIR}/vendor/github.com/oklog/ulid/v2
|
||||
|
||||
override_dh_auto_build-indep:
|
||||
dh_auto_build -O--package=gitlab -O--buildsystem=ruby -O--with=ruby
|
||||
|
|
Loading…
Reference in a new issue