diff --git a/debian/copyright b/debian/copyright index a0336ef59a..c6125a8f92 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,15 +4,6 @@ Source: https://gitlab.com/gitlab-org/gitlab-foss Comment: This package installs front end dependencies (nodejs modules) using yarn package manager from outside debian. This can go to main when all those nodejs modules are packaged in main. -Files-Excluded-elasticsearch-rails: - CHANGELOG.md - CONTRIBUTING.md - ~elasticsearch-model - elasticsearch-persistence - ~elasticsearch-rails - Gemfile - Rakefile - README.md Files: * Copyright: 2011-2015 GitLab B.V. @@ -38,14 +29,6 @@ Files: doc/legal/*_contributor_license_agreement.md Copyright: the Google Open Source Programs Office License: CC-BY-3.0 -Files: elasticsearch* -Copyright: 2014 Elasticsearch -License: Apache-2.0 - -Files: faraday-middleware-aws-signers-v4/* -Copyright: 2015 Genki Sugawara -License: Expat - Files: snowplow-javascript-tracker/* Copyright: 2010 Anthon Pang 2012 Snowplow Analytics Ltd diff --git a/debian/gbp.conf b/debian/gbp.conf index 9331c87730..03f65326e6 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,2 +1,2 @@ [DEFAULT] -component = [ 'elasticsearch-rails', 'snowplow-javascript-tracker', 'workhorse-vendor' ] +component = [ 'snowplow-javascript-tracker', 'workhorse-vendor' ] diff --git a/debian/watch b/debian/watch index 3e0b39b70b..0267080021 100644 --- a/debian/watch +++ b/debian/watch @@ -7,10 +7,6 @@ repack,compression=xz,oversionmangle=s{\Z}{+ds1},\ dversionmangle=s/(\d)[\+]?(debian|dfsg|ds|deb|gh)\d*(\~)*(rc)*(\d)*$/$1$3$4$5/ \ " https://gitlab.com/gitlab-org/gitlab-foss/-/tags?sort=updated_desc .*/gitlab-foss-v(\d[\d.]*)\.tar\.gz -opts="pgpmode=none,component=elasticsearch-rails,\ -" https://github.com/elastic/elasticsearch-rails/releases \ - .*/archive/.*/v?(6\.1\.0)@ARCHIVE_EXT@$ ignore - opts="pgpmode=none,component=snowplow-javascript-tracker,\ " https://github.com/snowplow/snowplow-javascript-tracker/tags?after=2.11.0-rc3 \ .*/archive/.*/v?(2\.10\.0)@ARCHIVE_EXT@$ ignore