diff --git a/debian/control b/debian/control
index dd24c99e89..e4ea0a2e9e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,9 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
 Uploaders: Cédric Boutillier <boutil@debian.org>,
-           Pirate Praveen <praveen@debian.org>,
-           Balasankar C <balasankarc@autistici.org>
-Build-Depends: bc,
-               debhelper (>= 9~),
-               dh-systemd,
-               gem2deb,
-               node-uglify
+ Pirate Praveen <praveen@debian.org>,
+ Balasankar C <balasankarc@autistici.org>
+Build-Depends: debhelper (>= 9~), gem2deb, dh-systemd, bc, node-uglify
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/gitlab.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/gitlab.git
@@ -20,179 +16,235 @@ XS-Ruby-Versions: all
 Package: gitlab
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: adduser (>= 3.34~),
-         asciidoctor (>= 1.5.2~),
-         bc,
-         bundler,
-         git (>= 1:2.7.3~),
-         gitlab-shell (>= 3.6.6-3~),
-         gitlab-workhorse (>= 0.8.5~),
-         libjs-chartjs,
-         libjs-clipboard,
-         libjs-fuzzaldrin-plus (>= 0.3.1+git.20161008.da2cb58+dfsg-4~),
-         libjs-graphael,
-         libjs-jquery-cookie,
-         libjs-jquery-history,
-         libjs-jquery-nicescroll,
-         lsb-base (>= 3.0-6),
-         nginx | httpd,
-         nodejs (>= 4~),
-         openssh-client,
-         postfix | exim4 | mail-transport-agent,
-         postgresql-client,
-         postgresql-contrib,
-         rake,
-         redis-server (>= 2:2.8~),
-         ruby | ruby-interpreter,
-         ruby-ace-rails-ap (>= 4.1~),
-         ruby-activerecord-session-store (>= 1.0~),
-         ruby-acts-as-taggable-on (>= 4.0~),
-         ruby-addressable (>= 2.3.8~),
-         ruby-after-commit-queue,
-         ruby-akismet,
-         ruby-allocations (>= 1.0~),
-         ruby-asana (>= 0.4.0~),
-         ruby-attr-encrypted (>= 3.0~),
-         ruby-babosa (>= 1.0.2~),
-         ruby-base32 (>= 0.3.0~),
-         ruby-bootstrap-sass (>= 3.3.0~),
-         ruby-browser (>= 2.2~),
-         ruby-cal-heatmap-rails (>= 3.6.0~),
-         ruby-carrierwave (>= 0.9~),
-         ruby-charlock-holmes (>= 0.7.3~),
-         ruby-chronic (>= 0.10.2-3~),
-         ruby-chronic-duration,
-         ruby-coffee-rails (>= 4.1.0~),
-         ruby-coffee-script-source (>= 1.10.0~),
-         ruby-connection-pool (>= 2.0~),
-         ruby-creole (>= 0.5.0~),
-         ruby-d3-rails (>= 3.1~),
-         ruby-default-value-for (>= 3~),
-         ruby-devise (>= 4.2~),
-         ruby-devise-two-factor (>= 3.0~),
-         ruby-diffy (>= 3.0.3~),
-         ruby-doorkeeper (>= 4.0~),
-         ruby-dropzonejs-rails (>= 0.7.1~),
-         ruby-email-reply-parser (>= 0.5.8~),
-         ruby-fog-aws (>= 0.9~),
-         ruby-fog-azure,
-         ruby-fog-core (>= 1.40~),
-         ruby-fog-google (>= 0.3~),
-         ruby-fog-local (>= 0.3~),
-         ruby-fog-openstack (>= 0.1~),
-         ruby-fog-rackspace,
-         ruby-fogbugz (>= 0.2.1-3~),
-         ruby-font-awesome-rails (>= 4.6.1~),
-         ruby-gemnasium-gitlab-service (>= 0.2~),
-         ruby-gemojione (>= 3.0~),
-         ruby-github-linguist (>= 4.7.0~),
-         ruby-github-markup (>= 1.5.1~),
-         ruby-gitlab-flowdock-git-hook (>= 1.0.1-2~),
-         ruby-gitlab-git (>= 10.7~),
-         ruby-gollum-lib (>= 4.2.1+debian~),
-         ruby-gon (>= 6.1~),
-         ruby-grape (>= 0.16.2-2~),
-         ruby-grape-entity (>= 0.6~),
-         ruby-hamlit (>= 2.7~),
-         ruby-health-check (>= 2.1~),
-         ruby-hipchat (>= 1.5.0~),
-         ruby-html-pipeline (>= 1.11.0),
-         ruby-htmlentities (>= 4.3.3~),
-         ruby-httparty (>= 0.13.3~),
-         ruby-influxdb (>= 0.2~),
-         ruby-jquery-atwho-rails (>= 1.3.2~),
-         ruby-jquery-rails (>= 4.1~),
-         ruby-jquery-scrollto-rails (>= 1.4.3~),
-         ruby-jquery-turbolinks (>= 2.1.0~),
-         ruby-jquery-ui-rails (>= 6.0~),
-         ruby-kaminari (>= 0.17~),
-         ruby-licensee (>= 8.0.0-2~),
-         ruby-loofah (>= 2.0.3~),
-         ruby-mail (>= 2.5.4~),
-         ruby-mail-room (>= 0.8.1~),
-         ruby-method-source (>= 0.8.2-2~),
-         ruby-mousetrap-rails (>= 1.4.6~),
-         ruby-nested-form (>= 0.3.2-2~),
-         ruby-net-ssh (>= 1:3.0.1~),
-         ruby-nokogiri (>= 1.6.7.2~),
-         ruby-nprogress-rails (>= 0.1.6.7~),
-         ruby-oauth2 (>= 1.2.0~),
-         ruby-octokit (>= 4.3.0~),
-         ruby-oj (>= 2.17.4),
-         ruby-omniauth (>= 1.3.1~),
-         ruby-omniauth-auth0 (>= 1.4.1~),
-         ruby-omniauth-azure-oauth2 (>= 0.0.6~),
-         ruby-omniauth-bitbucket (>= 0.0.2~),
-         ruby-omniauth-cas3 (>= 1.1.2~),
-         ruby-omniauth-crowd (>= 2.2.0~),
-         ruby-omniauth-facebook (>= 4.0~),
-         ruby-omniauth-github (>= 1.1.1~),
-         ruby-omniauth-gitlab (>= 1.0.2~),
-         ruby-omniauth-google-oauth2 (>= 0.4.1~),
-         ruby-omniauth-kerberos (>= 0.3.0-3~),
-         ruby-omniauth-ldap (>= 1.0.4~),
-         ruby-omniauth-saml (>= 1.7.0~),
-         ruby-omniauth-shibboleth (>= 1.2.0~),
-         ruby-omniauth-twitter (>= 1.2.0~),
-         ruby-org (>= 0.9.12-2~),
-         ruby-paranoia (>= 2.0~),
-         ruby-pg (>= 0.18.4~),
-         ruby-premailer-rails,
-         ruby-prof (>= 0.16.2~),
-         ruby-rack-attack (>= 4.3.1~),
-         ruby-rack-cors (>= 0.4.0~),
-         ruby-rack-oauth2 (>= 1.2.1~),
-         ruby-rails (<< 2:5),
-         ruby-rails (>= 2:4.2.7~),
-         ruby-rails-deprecated-sanitizer (>= 1.0.3~),
-         ruby-rainbow (>= 2.1~),
-         ruby-raphael-rails (>= 2.1.2~),
-         ruby-recaptcha (>= 3.0~),
-         ruby-redcarpet (>= 3.3.4~),
-         ruby-redcloth (>= 4.3.2-2~),
-         ruby-redis-namespace,
-         ruby-redis-rails (>= 4.0.0~),
-         ruby-request-store (>= 1.3~),
-         ruby-responders (>= 2.0~),
-         ruby-rouge (>= 2.0~),
-         ruby-rqrcode-rails3 (>= 0.1.7~),
-         ruby-sanitize (>= 2.0~),
-         ruby-sass-rails (>= 5.0.6~),
-         ruby-seed-fu (>= 2.3.5~),
-         ruby-select2-rails (>= 3.5.9~),
-         ruby-sentry-raven (>= 2.0~),
-         ruby-settingslogic (>= 2.0.9~),
-         ruby-sidekiq (>= 4.2~),
-         ruby-sidekiq-cron (>= 0.4.0~),
-         ruby-sinatra (>= 1.4.7-4~),
-         ruby-six (>= 0.2.0-3~),
-         ruby-slack-notifier (>= 1.2.0~),
-         ruby-sprockets (>= 3.6~),
-         ruby-sprockets-es6 (>= 0.9.2~),
-         ruby-state-machines-activerecord (>= 0.4.0~),
-         ruby-sys-filesystem,
-         ruby-task-list (>= 1.0.5~),
-         ruby-tinder (>= 1.10.1-2~),
-         ruby-truncato,
-         ruby-turbolinks (>= 2.5.3-3~),
-         ruby-u2f,
-         ruby-uglifier (>= 2.7.2~),
-         ruby-underscore-rails (>= 1.4~),
-         ruby-unf (>= 0.1.4-2~),
-         ruby-unicorn-worker-killer (>= 0.4.4~),
-         ruby-version-sorter (>= 2.1~),
-         ruby-virtus (>= 1.0.5-3~),
-         ruby-vmstat (>= 2.2.0~),
-         ruby-wikicloth (>= 0.8.1~),
-         ucf,
-         unicorn (>= 5.1~),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
+ lsb-base (>= 3.0-6),
+ git (>= 1:2.7.3~),
+ rake,
+ bundler,
+ postgresql-client,
+ adduser (>= 3.34~),
+ bc,
+ postgresql-contrib,
+ redis-server (>= 2:2.8~),
+ nodejs (>= 4~),
+ nginx | httpd,
+ postfix | exim4 | mail-transport-agent,
+ openssh-client,
+ ucf,
+ gitlab-shell (>= 3.6.6-3~),
+ gitlab-workhorse (>= 0.8.5~),
+ ruby-rails (>= 2:4.2.7~),
+ ruby-rails (<< 2:5),
+ ruby-rails-deprecated-sanitizer (>= 1.0.3~),
+ ruby-responders (>= 2.0~),
+ ruby-sprockets (>= 3.6~),
+ ruby-sprockets-es6 (>= 0.9.2~),
+ ruby-default-value-for (>= 3~),
+#ruby-mysql2 | ruby-pg,
+ ruby-pg (>= 0.18.4~),
+# Authentication libraries
+ ruby-devise (>= 4.2~),
+ ruby-doorkeeper (>= 4.0~),
+ ruby-omniauth (>= 1.3.1~),
+ ruby-omniauth-auth0 (>= 1.4.1~),
+ ruby-omniauth-azure-oauth2 (>= 0.0.6~),
+ ruby-omniauth-bitbucket (>= 0.0.2~),
+ ruby-omniauth-cas3 (>= 1.1.2~),
+ ruby-omniauth-facebook (>= 4.0~),
+ ruby-omniauth-github (>= 1.1.1~),
+ ruby-omniauth-gitlab (>= 1.0.2~),
+ ruby-omniauth-google-oauth2 (>= 0.4.1~),
+ ruby-omniauth-kerberos (>= 0.3.0-3~),
+ ruby-omniauth-saml (>= 1.7.0~),
+ ruby-omniauth-shibboleth (>= 1.2.0~),
+ ruby-omniauth-twitter (>= 1.2.0~),
+ ruby-omniauth-crowd (>= 2.2.0~),
+ ruby-rack-oauth2 (>= 1.2.1~),
+# Spam and anti-bot protection
+ ruby-recaptcha (>= 3.0~),
+ ruby-akismet,
+# Two-factor authentication
+ ruby-devise-two-factor (>= 3.0~),
+ ruby-rqrcode-rails3 (>= 0.1.7~),
+ ruby-attr-encrypted (>= 3.0~),
+ ruby-u2f,
+# Browser detection
+ ruby-browser (>= 2.2~),
+# Extracting information from a git repository
+ ruby-gitlab-git (>= 10.7~),
+# LDAP Auth
+# Debian package includes gitlab patches
+ ruby-omniauth-ldap (>= 1.0.4~),
+# Git Wiki
+ ruby-gollum-lib (>= 4.2.1+debian~),
+# Language detection
+ ruby-github-linguist (>= 4.7.0~),
+# API
+ ruby-grape (>= 0.16.2-2~),
+ ruby-grape-entity (>= 0.6~),
+ ruby-rack-cors (>= 0.4.0~),
+# Pagination
+ ruby-kaminari (>= 0.17~),
+# HAML
+ ruby-hamlit (>= 2.7~),
+# Files attachments
+ ruby-carrierwave (>= 0.9~),
+# Drag and Drop UI
+ ruby-dropzonejs-rails (>= 0.7.1~),
+# for backups
+ ruby-fog-aws (>= 0.9~),
+ ruby-fog-azure,
+ ruby-fog-core (>= 1.40~),
+ ruby-fog-local (>= 0.3~),
+ ruby-fog-google (>= 0.3~),
+ ruby-fog-openstack (>= 0.1~),
+ ruby-fog-rackspace,
+# for aws storage
+ ruby-unf (>= 0.1.4-2~),
+# Authorization
+ ruby-six (>= 0.2.0-3~),
+# Seed data
+ ruby-seed-fu (>= 2.3.5~),
+# Markdown and HTML processing
+ ruby-htmlentities (>= 4.3.3~),
+ ruby-html-pipeline (>= 1.11.0),
+ ruby-task-list (>= 1.0.5~),
+ ruby-github-markup (>= 1.5.1~),
+ ruby-redcarpet (>= 3.3.4~),
+ ruby-redcloth (>= 4.3.2-2~),
+ ruby-org (>= 0.9.12-2~),
+ ruby-creole (>= 0.5.0~),
+ ruby-wikicloth (>= 0.8.1~),
+ asciidoctor (>= 1.5.2~),
+ ruby-rouge (>= 2.0~),
+ ruby-truncato,
+ ruby-nokogiri (>= 1.6.7.2~),
+# Diffs
+ ruby-diffy (>= 3.0.3~),
+# Application server
+ unicorn (>= 5.1~),
+   ruby-unicorn-worker-killer (>= 0.4.4~),
+# State machine
+ ruby-state-machines-activerecord (>= 0.4.0~),
+# Run events after state machine commits
+ ruby-after-commit-queue,
+# Issue tags
+ ruby-acts-as-taggable-on (>= 4.0~),
+# Background jobs
+ ruby-sinatra (>= 1.4.7-4~),
+ ruby-sidekiq (>= 4.2~),
+ ruby-sidekiq-cron (>= 0.4.0~),
+ ruby-redis-namespace,
+# HTTP requests
+ ruby-httparty (>= 0.13.3~),
+# Colored output to console
+ ruby-rainbow (>= 2.1~),
+# GitLab settings
+ ruby-settingslogic (>= 2.0.9~),
+# Misc
+ ruby-version-sorter (>= 2.1~),
+# Cache
+ ruby-redis-rails (>= 4.0.0~),
+# Campfire integration
+ ruby-tinder (>= 1.10.1-2~),
+# HipChat integration
+ ruby-hipchat (>= 1.5.0~),
+# Flowdock integration
+ ruby-gitlab-flowdock-git-hook (>= 1.0.1-2~),
+# Gemnasium integration
+ ruby-gemnasium-gitlab-service (>= 0.2~),
+# Slack integration
+ ruby-slack-notifier (>= 1.2.0~),
+# Asana integration
+ ruby-asana (>= 0.4.0~),
+# FogBugz integration
+ ruby-fogbugz (>= 0.2.1-3~),
+# d3
+ ruby-d3-rails (>= 3.1~),
+#cal-heatmap
+ ruby-cal-heatmap-rails (>= 3.6.0~),
+# underscore-rails
+ ruby-underscore-rails (>= 1.4~),
+# Sanitize user input
+ ruby-sanitize (>= 2.0~),
+ ruby-babosa (>= 1.0.2~),
+# Sanitizes SVG input
+ ruby-loofah (>= 2.0.3~),
+# Working with license
+ ruby-licensee (>= 8.0.0-2~),
+# Protect against bruteforcing
+ ruby-rack-attack (>= 4.3.1~),
+# Ace editor
+ ruby-ace-rails-ap (>= 4.1~),
+# Keyboard shortcuts
+ ruby-mousetrap-rails (>= 1.4.6~),
+# Detect and convert string character encoding
+ ruby-charlock-holmes (>= 0.7.3~),
+# Faster JSON
+ ruby-oj (>= 2.17.4),
+# Parse time & duration
+ ruby-chronic (>= 0.10.2-3~),
+ ruby-chronic-duration,
+ ruby-sass-rails (>= 5.0.6~),
+ ruby-coffee-rails (>= 4.1.0~),
+ ruby-coffee-script-source (>= 1.10.0~),
+ ruby-uglifier (>= 2.7.2~),
+ ruby-turbolinks (>= 2.5.3-3~),
+ ruby-jquery-turbolinks (>= 2.1.0~),
+ ruby-addressable (>= 2.3.8~),
+ ruby-bootstrap-sass (>= 3.3.0~),
+ ruby-font-awesome-rails (>= 4.6.1~),
+ ruby-gemojione (>= 3.0~),
+ ruby-gon (>= 6.1~),
+ ruby-jquery-atwho-rails (>= 1.3.2~),
+ ruby-jquery-rails (>= 4.1~),
+ ruby-jquery-scrollto-rails (>= 1.4.3~),
+ ruby-jquery-ui-rails (>= 6.0~),
+ ruby-nprogress-rails (>= 0.1.6.7~),
+ ruby-raphael-rails (>= 2.1.2~),
+ ruby-request-store (>= 1.3~),
+ ruby-select2-rails (>= 3.5.9~),
+ ruby-virtus (>= 1.0.5-3~),
+ ruby-net-ssh (>= 1:3.0.1~),
+ ruby-base32 (>= 0.3.0~),
+# Metrics
+ ruby-allocations (>= 1.0~),
+ ruby-method-source (>= 0.8.2-2~),
+ ruby-influxdb (>= 0.2~),
+ ruby-connection-pool (>= 2.0~),
+ ruby-sentry-raven (>= 2.0~),
+ ruby-premailer-rails,
+# ruby-actionmailer,
+ ruby-mail (>= 2.5.4~),
+ ruby-octokit (>= 4.3.0~),
+ ruby-mail-room (>= 0.8.1~),
+ ruby-email-reply-parser (>= 0.5.8~),
+ ruby-prof (>= 0.16.2~),
+## CI
+ ruby-activerecord-session-store (>= 1.0~),
+ ruby-nested-form (>= 0.3.2-2~),
+# OAuth
+ ruby-oauth2 (>= 1.2.0~),
+# Soft deletion
+ ruby-paranoia (>= 2.0~),
+# Health check
+ ruby-health-check (>= 2.1~),
+# System information
+ ruby-vmstat (>= 2.2.0~),
+ ruby-sys-filesystem,
+# Vendored js files
+ libjs-jquery-cookie,
+ libjs-jquery-history,
+ libjs-jquery-nicescroll,
+ libjs-clipboard,
+ libjs-chartjs,
+ libjs-graphael,
+ libjs-fuzzaldrin-plus (>= 0.3.1+git.20161008.da2cb58+dfsg-4~)
 Recommends: certbot
 Description: git powered software platform to collaborate on code (non-omnibus)
  gitlab provides web based interface to host source code and track issues.
  It allows anyone for fork a repository and send merge requests. Code review
- is possible using merge request workflow. Using groups and roles project
+ is possible using merge request workflow. Using groups and roles project 
  access can be controlled.
  .
  Unlike the official package from GitLab Inc., this package does not use
diff --git a/debian/copyright b/debian/copyright
index 3d4344707d..a7f175ba37 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -81,7 +81,7 @@ License: OFL
  .
  The OFL allows the licensed fonts to be used, studied, modified and
  redistributed freely as long as they are not sold by themselves. The
- fonts, including any derivative works, can be bundled, embedded,
+ fonts, including any derivative works, can be bundled, embedded, 
  redistributed and/or sold with any software provided that any reserved
  names are not used by derivative works. The fonts and derivatives,
  however, cannot be released under any other type of license. The
diff --git a/debian/gitlab.links b/debian/gitlab.links
index 6348bbc2ee..5e549bd8ad 100644
--- a/debian/gitlab.links
+++ b/debian/gitlab.links
@@ -1,20 +1,20 @@
-/var/lib/gitlab/.gitlab_workhorse_secret    /usr/share/gitlab/.gitlab_workhorse_secret
-/var/lib/gitlab/Gemfile.lock    /usr/share/gitlab/Gemfile.lock
-etc/gitlab usr/share/gitlab/config
-run/gitlab usr/share/gitlab/tmp
-usr/share/javascript/chartjs/Chart.js usr/share/gitlab/vendor/assets/javascripts/chart-lib.min.js
-usr/share/javascript/clipboard/clipboard.js usr/share/gitlab/vendor/assets/javascripts/clipboard.js
-usr/share/javascript/fuzzaldrin/fuzzaldrin-plus.js usr/share/gitlab/vendor/assets/javascripts/fuzzaldrin-plus.js
-usr/share/javascript/graphael/g.bar-min.js usr/share/gitlab/vendor/assets/javascripts/g.bar-min.js
-usr/share/javascript/graphael/g.raphael-min.js usr/share/gitlab/vendor/assets/javascripts/g.raphael-min.js
-usr/share/javascript/jquery-cookie/jquery.cookie.min.js usr/share/gitlab/vendor/assets/javascripts/jquery.cookie.js
-usr/share/javascript/jquery-history/jquery.history.min.js usr/share/gitlab/vendor/assets/javascripts/jquery.history.js
-usr/share/javascript/jquery-nicescroll/jquery.nicescroll.min.js usr/share/gitlab/vendor/assets/javascripts/jquery.nicescroll.min.js
-var/lib/gitlab/.bundle usr/share/gitlab/.bundle
-var/lib/gitlab/.ssh usr/share/gitlab/.ssh
-var/lib/gitlab/db usr/share/gitlab/db
 var/lib/gitlab/public usr/share/gitlab/public
-var/lib/gitlab/secrets.yml etc/gitlab/secrets.yml
 var/lib/gitlab/shared usr/share/gitlab/shared
+var/lib/gitlab/db usr/share/gitlab/db
+var/lib/gitlab/.ssh usr/share/gitlab/.ssh
+var/lib/gitlab/.bundle usr/share/gitlab/.bundle
+var/lib/gitlab/secrets.yml etc/gitlab/secrets.yml
 var/log/gitlab usr/share/gitlab/log
 var/log/gitlab/builds usr/share/gitlab/builds
+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
+usr/share/javascript/jquery-nicescroll/jquery.nicescroll.min.js usr/share/gitlab/vendor/assets/javascripts/jquery.nicescroll.min.js
+usr/share/javascript/clipboard/clipboard.js usr/share/gitlab/vendor/assets/javascripts/clipboard.js
+usr/share/javascript/chartjs/Chart.js usr/share/gitlab/vendor/assets/javascripts/chart-lib.min.js
+usr/share/javascript/graphael/g.raphael-min.js usr/share/gitlab/vendor/assets/javascripts/g.raphael-min.js
+usr/share/javascript/graphael/g.bar-min.js usr/share/gitlab/vendor/assets/javascripts/g.bar-min.js
+usr/share/javascript/fuzzaldrin/fuzzaldrin-plus.js usr/share/gitlab/vendor/assets/javascripts/fuzzaldrin-plus.js
+/var/lib/gitlab/.gitlab_workhorse_secret    /usr/share/gitlab/.gitlab_workhorse_secret
+/var/lib/gitlab/Gemfile.lock    /usr/share/gitlab/Gemfile.lock
diff --git a/debian/install b/debian/install
index b47eb78c68..621767263e 100644
--- a/debian/install
+++ b/debian/install
@@ -1,45 +1,45 @@
+debian/conf/gitlab etc/default
+debian/conf/unicorn.rb etc/gitlab
+debian/conf/database.yml etc/gitlab
+debian/conf/gitlab.yml.example usr/lib/gitlab/templates
+debian/conf/resque.yml etc/gitlab
+debian/conf/gitlab-debian.conf.example usr/lib/gitlab/templates
+debian/conf/*.target lib/systemd/system
+debian/conf/smtp_settings.rb etc/gitlab/initializers
+debian/conf/tmpfiles.d/gitlab.conf.example usr/lib/gitlab/templates/tmpfiles.d
+debian/conf/nginx.conf.example usr/lib/gitlab/templates
+debian/conf/nginx.ssl.conf.example usr/lib/gitlab/templates
+debian/adduser.sh usr/lib/gitlab/scripts
+debian/grantpriv.sh usr/lib/gitlab/scripts
+debian/rake-tasks.sh usr/lib/gitlab/scripts
+debian/gitlab-check.sh usr/lib/gitlab/scripts
+app usr/share/gitlab
+bin usr/share/gitlab
 CHANGELOG.md usr/share/gitlab
+changelogs usr/share/gitlab
+config/* etc/gitlab
+config.ru usr/share/gitlab
 CONTRIBUTING.md usr/share/gitlab
+doc usr/share/gitlab
+docker usr/share/gitlab
+docker-compose.yml usr/share/gitlab
+doc_styleguide.md usr/share/gitlab
+features usr/share/gitlab
+fixtures usr/share/gitlab
+Gemfile usr/share/gitlab
+generator_templates usr/share/gitlab
 GITLAB_SHELL_VERSION usr/share/gitlab
 GITLAB_WORKHORSE_VERSION usr/share/gitlab
-Gemfile usr/share/gitlab
+lib usr/share/gitlab
 MAINTENANCE.md usr/share/gitlab
 PROCESS.md usr/share/gitlab
 Procfile usr/share/gitlab
-README.md usr/share/gitlab
 Rakefile usr/share/gitlab
-VERSION usr/share/gitlab
-app usr/share/gitlab
-bin usr/share/gitlab
-changelogs usr/share/gitlab
-config.ru usr/share/gitlab
-config/* etc/gitlab
-db var/lib/gitlab
-debian/adduser.sh usr/lib/gitlab/scripts
-debian/conf/*.target lib/systemd/system
-debian/conf/database.yml etc/gitlab
-debian/conf/gitlab etc/default
-debian/conf/gitlab-debian.conf.example usr/lib/gitlab/templates
-debian/conf/gitlab.yml.example usr/lib/gitlab/templates
-debian/conf/nginx.conf.example usr/lib/gitlab/templates
-debian/conf/nginx.ssl.conf.example usr/lib/gitlab/templates
-debian/conf/resque.yml etc/gitlab
-debian/conf/smtp_settings.rb etc/gitlab/initializers
-debian/conf/tmpfiles.d/gitlab.conf.example usr/lib/gitlab/templates/tmpfiles.d
-debian/conf/unicorn.rb etc/gitlab
-debian/gitlab-check.sh usr/lib/gitlab/scripts
-debian/grantpriv.sh usr/lib/gitlab/scripts
-debian/rake-tasks.sh usr/lib/gitlab/scripts
-doc usr/share/gitlab
-doc_styleguide.md usr/share/gitlab
-docker usr/share/gitlab
-docker-compose.yml usr/share/gitlab
-features usr/share/gitlab
-fixtures usr/share/gitlab
-generator_templates usr/share/gitlab
-lib usr/share/gitlab
-public var/lib/gitlab
+README.md usr/share/gitlab
 scripts usr/share/gitlab
-shared var/lib/gitlab
 spec usr/share/gitlab
 vendor usr/share/gitlab
+VERSION usr/share/gitlab
+shared var/lib/gitlab
+public var/lib/gitlab
+db var/lib/gitlab
diff --git a/debian/ruby-gitlab-ce.git.docs b/debian/ruby-gitlab-ce.git.docs
index cd90d2c86d..52566a69bb 100644
--- a/debian/ruby-gitlab-ce.git.docs
+++ b/debian/ruby-gitlab-ce.git.docs
@@ -1,6 +1,6 @@
-# Examples:
-# FIXME: READMEs found
 # FIXME: doc/ dir found in source. Consider installing the docs.
-# README.md
+# Examples:
 # doc/manual.html
 # doc/site/*
+# FIXME: READMEs found
+# README.md