From e293c6c2fbba8052881a31f5ac52bffb0d1ba1d6 Mon Sep 17 00:00:00 2001
From: Dmitry Smirnov <onlyjob@member.fsf.org>
Date: Mon, 1 Feb 2021 12:55:03 +1100
Subject: [PATCH] watch: fixed upstream MUT/tarballs downloading with "uscan"
 and "origtargz".

---
 debian/copyright          |  9 +++++++++
 debian/gitlab.install     |  4 ++--
 debian/upstream-file-list |  1 -
 debian/watch              | 17 +++++++----------
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index c3f258ee41..a0336ef59a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,6 +4,15 @@ 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.
diff --git a/debian/gitlab.install b/debian/gitlab.install
index 709e57dc71..213288414c 100644
--- a/debian/gitlab.install
+++ b/debian/gitlab.install
@@ -68,5 +68,5 @@ VERSION usr/share/gitlab
 shared var/lib/gitlab
 public var/lib/gitlab
 db var/lib/gitlab
-elasticsearch-model usr/share/gitlab/vendor/gems
-elasticsearch-rails usr/share/gitlab/vendor/gems
+elasticsearch-rails/elasticsearch-model usr/share/gitlab/vendor/gems
+elasticsearch-rails/elasticsearch-rails usr/share/gitlab/vendor/gems
diff --git a/debian/upstream-file-list b/debian/upstream-file-list
index 1c0e15bbf9..bda1e3fd2f 100644
--- a/debian/upstream-file-list
+++ b/debian/upstream-file-list
@@ -72,7 +72,6 @@ debian
 doc
 docker
 docker-compose.yml
-elasticsearch-model
 elasticsearch-rails
 file_hooks
 fixtures
diff --git a/debian/watch b/debian/watch
index 71c10789a6..a81da0a5f5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,15 +1,12 @@
 version=4
 opts="uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,\
-filenamemangle=s/.*v(.*)\/.*/gitlab-$1.tar.gz/,\
 dversionmangle=s/(\d)[\+]?(debian|dfsg|ds|deb|gh)\d*(\~)*(rc)*(\d)*$/$1$3$4$5/ \
-" https://gitlab.com/gitlab-org/gitlab-foss/-/tags .*/gitlab-foss-v(\d[\d.]*)\.tar\.gz debian
+" https://gitlab.com/gitlab-org/gitlab-foss/-/tags .*/gitlab-foss-v(\d[\d.]*)\.tar\.gz
 
-opts="pgpmode=none,component=elasticsearch-model" \
-https://gemwatch.debian.net/elasticsearch-model .*/elasticsearch-model-(6.1.*).tar.gz ignore
+opts="pgpmode=none,component=elasticsearch-rails,dversionmangle=s{[\d\.]+}{6.1.0}" \
+ https://github.com/elastic/elasticsearch-rails/releases \
+ .*/archive/v?(\d[\d\.]+)@ARCHIVE_EXT@$
 
-opts="pgpmode=none,component=elasticsearch-rails" \
-https://gemwatch.debian.net/elasticsearch-rails .*/elasticsearch-rails-(6.1.*).tar.gz ignore
-
-opts="pgpmode=none,component=snowplow-javascript-tracker,\
-filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/snowplow-javascript-tracker-\$1\.tar\.gz/" \
-https://github.com/snowplow/snowplow-javascript-tracker/tags?after=2.11.0-rc3 .*/v?(2.10.0)\.tar\.gz ignore
+opts="pgpmode=none,component=snowplow-javascript-tracker,dversionmangle=s{[\d\.]+}{2.10.0}" \
+ https://github.com/snowplow/snowplow-javascript-tracker/tags?after=2.11.0-rc3 \
+ .*/archive/v?(\d[\d\.]+)@ARCHIVE_EXT@$