diff --git a/debian/gitlab.links b/debian/gitlab.links index 1e97355d3e..62afc061de 100644 --- a/debian/gitlab.links +++ b/debian/gitlab.links @@ -1,7 +1,6 @@ var/lib/gitlab/uploads usr/share/gitlab/public/uploads var/log/gitlab usr/share/gitlab/log -run/gitlab usr/share/gitlab/tmp/pids -run/gitlab usr/share/gitlab/tmp/sockets +run/gitlab usr/share/gitlab/tmp etc/gitlab usr/share/gitlab/config usr/share/javascript/jquery-history/jquery.history.min.js usr/share/gitlab/vendor/assets/javascripts/jquery.history.js usr/share/javascript/jquery-cookie/jquery.cookie.min.js usr/share/gitlab/vendor/assets/javascripts/jquery.cookie.js diff --git a/debian/install b/debian/install index 2fcdef99cb..b25aa76d2d 100644 --- a/debian/install +++ b/debian/install @@ -36,6 +36,5 @@ README.md usr/share/gitlab scripts usr/share/gitlab shared usr/share/gitlab spec usr/share/gitlab -tmp usr/share/gitlab vendor usr/share/gitlab VERSION usr/share/gitlab diff --git a/debian/upstream-file-count-check.sh b/debian/upstream-file-count-check.sh index e0a03aa88a..db2fad98f2 100644 --- a/debian/upstream-file-count-check.sh +++ b/debian/upstream-file-count-check.sh @@ -1,6 +1,6 @@ ucount=$(ls -1 | wc -l) dcount=$(cat debian/install |cut -d' ' -f1|grep -v debian |wc -l) -ignored=6 +ignored=7 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/install or adjust 'ignored=${ignored}'"