From f7f4b5836483e51aa9900c40c38407b01403439a Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Thu, 6 Dec 2018 12:00:26 +0530
Subject: [PATCH] Adjust install file for upstream changes

---
 debian/gitlab.install               |  1 -
 debian/upstream-file-count-check.sh |  4 +-
 debian/upstream-file-list           | 71 +++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 debian/upstream-file-list

diff --git a/debian/gitlab.install b/debian/gitlab.install
index f36a20c080..81f68f5eea 100644
--- a/debian/gitlab.install
+++ b/debian/gitlab.install
@@ -11,7 +11,6 @@ debian/conf/nginx.conf.example usr/lib/gitlab/templates
 debian/conf/nginx.ssl.conf.example usr/lib/gitlab/templates
 debian/rake-tasks.sh usr/lib/gitlab/scripts
 debian/gitlab-rake.sh usr/lib/gitlab/scripts
-.babelrc usr/share/gitlab
 app usr/share/gitlab
 bin usr/share/gitlab
 CHANGELOG.md usr/share/gitlab
diff --git a/debian/upstream-file-count-check.sh b/debian/upstream-file-count-check.sh
index b07d34ed86..dce94844dc 100644
--- a/debian/upstream-file-count-check.sh
+++ b/debian/upstream-file-count-check.sh
@@ -2,10 +2,12 @@
 
 ucount=$(ls -1a |grep -vx .git | wc -l)
 dcount=$(cat debian/gitlab.install |cut -d' ' -f1|grep -v debian |wc -l)
-ignored=32
+ignored=33
 if ! [ $(echo "$ucount" - "$dcount"|bc) -eq $ignored ]; then
   echo "Found new files added by upstream and not added to debian/install"
   echo "Add them to debian/gitlab.install or adjust 'ignored=${ignored}'"
   echo "in debian/upstream-file-count-check.sh as required"
+  ls -1a |grep -vx .git > debian/upstream-file-list.new
+  diff -y debian/upstream-file-list debian/upstream-file-list.new
   exit 1
 fi
diff --git a/debian/upstream-file-list b/debian/upstream-file-list
new file mode 100644
index 0000000000..1bd6ac51d6
--- /dev/null
+++ b/debian/upstream-file-list
@@ -0,0 +1,71 @@
+.
+..
+app
+.babelrc.js
+bin
+builds
+CHANGELOG.md
+changelogs
+.codeclimate.yml
+config
+config.ru
+CONTRIBUTING.md
+.csscomb.json
+danger
+Dangerfile
+db
+debian
+doc
+docker
+docker-compose.yml
+.eslintignore
+.eslintrc.yml
+fixtures
+.foreman
+Gemfile
+Gemfile.lock
+Gemfile.rails5
+Gemfile.rails5.lock
+generator_templates
+GITALY_SERVER_VERSION
+.gitattributes
+.github
+.gitignore
+.gitlab
+.gitlab-ci.yml
+GITLAB_PAGES_VERSION
+GITLAB_SHELL_VERSION
+GITLAB_WORKHORSE_VERSION
+.haml-lint.yml
+INSTALLATION_TYPE
+lib
+LICENSE
+locale
+log
+.mailmap
+MAINTENANCE.md
+.nvmrc
+package.json
+.pkgr.yml
+plugins
+.prettierignore
+.prettierrc
+PROCESS.md
+Procfile
+public
+qa
+Rakefile
+README.md
+rubocop
+.rubocop_todo.yml
+.rubocop.yml
+.ruby-version
+scripts
+.scss-lint.yml
+shared
+spec
+symbol
+tmp
+vendor
+VERSION
+yarn.lock