Run wrap-and-sort on packaging files

debian/control

@@ -4,7 +4,10 @@ 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>
-Build-Depends: debhelper (>= 9~), gem2deb, dh-systemd, bc
+Build-Depends: bc,
+               debhelper (>= 9~),
+               dh-systemd,
+               gem2deb
 Standards-Version: 3.9.7
 Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/gitlab.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/gitlab.git
@@ -15,196 +18,148 @@ XS-Ruby-Versions: all
 Package: gitlab
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
+Depends: adduser (>= 3.34~),
- git,
+         asciidoctor (>= 1.5.2~),
- rake,
- bundler,
- postgresql-client,
- adduser (>= 3.34~),
          bc,
- postgresql,
+         bundler,
- redis-server (>= 2:2.8~),
+         git,
- nodejs (>= 4~),
- nginx,
- letsencrypt,
          gitlab-shell (>= 2.6.10~),
          gitlab-workhorse (>= 0.6.2~),
- ruby-rails (>= 2:4.2.4~),
+         letsencrypt,
- ruby-rails (<< 2:5),
+         libjs-chartjs,
- ruby-rails-deprecated-sanitizer (>= 1.0.3~),
+         libjs-clipboard,
- ruby-responders (>= 2.0~),
+         libjs-fuzzaldrin-plus,
- ruby-sprockets (>= 3.3.0~),
+         libjs-graphael,
+         libjs-jquery-cookie,
+         libjs-jquery-history,
+         libjs-jquery-nicescroll,
+         nginx,
+         nodejs (>= 4~),
+         postgresql,
+         postgresql-client,
+         rake,
+         redis-server (>= 2:2.8~),
+         ruby | ruby-interpreter,
+         ruby-ace-rails-ap (>= 3.0.3~),
+         ruby-activerecord-deprecated-finders (>= 1.0.3-2~),
+         ruby-activerecord-session-store (>= 0.1.0~),
+         ruby-acts-as-taggable-on (>= 3.4~),
+         ruby-addressable (>= 2.3.8~),
+         ruby-after-commit-queue,
+         ruby-allocations (>= 1.0~),
+         ruby-asana (>= 0.4.0~),
+         ruby-attr-encrypted (>= 1.3.4~),
+         ruby-babosa (>= 1.0.2~),
+         ruby-bootstrap-sass (>= 3.3.0~),
+         ruby-browser (>= 1.0.0~),
+         ruby-cal-heatmap-rails (>= 3.5.1~),
+         ruby-carrierwave (>= 0.9~),
+         ruby-charlock-holmes (>= 0.7.3~),
+         ruby-coffee-rails (>= 4.1.0~),
+         ruby-colorize (>= 0.7.0~),
+         ruby-connection-pool (>= 2.0~),
+         ruby-creole (>= 0.5.0~),
+         ruby-d3-rails (>= 3.1~),
          ruby-default-value-for (>= 3~),
-#ruby-mysql2 | ruby-pg,
- ruby-pg (>= 1.18.2~),
-# Authentication libraries
          ruby-devise (>= 3.2~),
          ruby-devise-async (>= 0.9~),
+         ruby-devise-two-factor (>= 2.0.0~),
+         ruby-diffy (>= 3.0.3~),
          ruby-doorkeeper (>= 2.1~),
+         ruby-dropzonejs-rails (>= 0.7.1~),
+         ruby-email-reply-parser (>= 0.5.8~),
+         ruby-fog (>= 1.25~),
+         ruby-fogbugz (>= 0.2.1~),
+         ruby-font-awesome-rails (>= 4.2~),
+         ruby-gemnasium-gitlab-service (>= 0.2~),
+         ruby-github-linguist (>= 4.7.0~),
+         ruby-github-markup (>= 1.3.1~),
+         ruby-gitlab-emoji (>= 0.2.0~),
+         ruby-gitlab-flowdock-git-hook (>= 1.0.1~),
+         ruby-gitlab-git (>= 7.2.24~),
+         ruby-gollum-lib (>= 4.1.0~),
+         ruby-gon (>= 6.0.1~),
+         ruby-grape (>= 0.13.0~),
+         ruby-grape-entity (>= 0.4.2~),
+         ruby-haml-rails (>= 0.9.0~),
+         ruby-hipchat (>= 1.5.0~),
+         ruby-html-pipeline (>= 1.11.0),
+         ruby-httparty (>= 0.13.3~),
+         ruby-influxdb (>= 0.2~),
+         ruby-jquery-atwho-rails (>= 1.3.2~),
+         ruby-jquery-rails (>= 4.0.0~),
+         ruby-jquery-scrollto-rails (>= 1.4.3~),
+         ruby-jquery-turbolinks (>= 2.1.0~),
+         ruby-jquery-ui-rails (>= 5.0.0~),
+         ruby-kaminari (>= 0.16.3),
+         ruby-mail-room (>= 0.6.1),
+         ruby-method-source (>= 0.8~),
+         ruby-mousetrap-rails (>= 1.4.6~),
+         ruby-nested-form (>= 0.3.2~),
+         ruby-net-ssh (>= 2.9.2~),
+         ruby-nokogiri (>= 1.6.7.1~),
+         ruby-nprogress-rails (>= 0.1.6.7~),
+         ruby-oauth2 (>= 1.0.0~),
+         ruby-octokit (>= 3.7~),
          ruby-omniauth (>= 1.2.2~),
          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 (>= 3.0.0~),
          ruby-omniauth-github (>= 1.1.1~),
          ruby-omniauth-gitlab (>= 1.0.0~),
          ruby-omniauth-google-oauth2 (>= 0.2.0~),
          ruby-omniauth-kerberos (>= 0.3.0-3~),
+         ruby-omniauth-ldap (>= 1.0.4~),
          ruby-omniauth-saml (>= 1.4.0~),
          ruby-omniauth-shibboleth (>= 1.2.0~),
          ruby-omniauth-twitter (>= 1.2.0~),
- ruby-omniauth-crowd (>= 2.2.0~),
+         ruby-org (>= 0.9.12~),
- ruby-rack-oauth2 (>= 1.2.1~),
+         ruby-paranoia (>= 2.0~),
-# reCAPTCHA protection
+         ruby-pg (>= 1.18.2~),
- ruby-recaptcha,
+         ruby-rack-attack (>= 4.3.1~),
-# Two-factor authentication
- ruby-devise-two-factor (>= 2.0.0~),
- ruby-rqrcode-rails3 (>= 0.1.7~),
- ruby-attr-encrypted (>= 1.3.4~),
-# Browser detection
- ruby-browser (>= 1.0.0~),
-# Extracting information from a git repository
- ruby-gitlab-git (>= 7.2.24~),
-# LDAP Auth
-# Debian package includes gitlab patches
- ruby-omniauth-ldap (>= 1.0.4~),
-# Git Wiki
- ruby-gollum-lib (>= 4.1.0~),
-# Language detection
- ruby-github-linguist (>= 4.7.0~),
-# API
- ruby-grape (>= 0.13.0~),
- ruby-grape-entity (>= 0.4.2~),
          ruby-rack-cors (>= 0.4.0~),
-# Pagination
+         ruby-rack-oauth2 (>= 1.2.1~),
- ruby-kaminari (>= 0.16.3),
+         ruby-rails (<< 2:5),
-# HAML
+         ruby-rails (>= 2:4.2.4~),
- ruby-haml-rails (>= 0.9.0~),
+         ruby-rails-deprecated-sanitizer (>= 1.0.3~),
-# Files attachments
+         ruby-raphael-rails (>= 2.1.2~),
- ruby-carrierwave (>= 0.9~),
+         ruby-recaptcha,
-# Drag and Drop UI
- ruby-dropzonejs-rails (>= 0.7.1~),
-# for aws storage
- ruby-fog (>= 1.25~),
- ruby-unf (>= 0.1.4),
-# Authorization
- ruby-six (>= 0.2.0~),
-# Seed data
- ruby-seed-fu (>= 2.3.5~),
-# Markdown and HTML processing
- ruby-html-pipeline (>= 1.11.0),
- ruby-task-list (>= 1.0.2~),
- ruby-github-markup (>= 1.3.1~),
          ruby-redcarpet (>= 3.3.3~),
          ruby-redcloth (>= 4.2.9~),
- ruby-org (>= 0.9.12~),
+         ruby-redis-namespace,
- ruby-creole (>= 0.5.0~),
+         ruby-redis-rails (>= 4.0.0~),
- ruby-wikicloth (>= 0.8.1~),
+         ruby-request-store (>= 1.1~),
- asciidoctor (>= 1.5.2~),
+         ruby-responders (>= 2.0~),
          ruby-rouge (>= 1.10.1~),
- ruby-nokogiri (>= 1.6.7.1~),
+         ruby-rqrcode-rails3 (>= 0.1.7~),
-# Diffs
+         ruby-sanitize (>= 2.0~),
- ruby-diffy (>= 3.0.3~),
+         ruby-sass-rails (>= 5.0.0~),
-# Application server
+         ruby-seed-fu (>= 2.3.5~),
- unicorn (>= 4.8~),
+         ruby-select2-rails (>= 3.5.9~),
- ruby-unicorn-worker-killer (>= 0.4.2~),
+         ruby-sentry-raven,
-# State machine
+         ruby-settingslogic (>= 2.0.9~),
- ruby-state-machines-activerecord (>= 0.3.0~),
-# Run events after state machine commits
- ruby-after-commit-queue,
-# Issue tags
- ruby-acts-as-taggable-on (>= 3.4~),
-# Background jobs
- ruby-sinatra (>= 1.4.4~),
          ruby-sidekiq (>= 4.0~),
          ruby-sidekiq-cron (>= 0.4.0~),
- ruby-redis-namespace,
+         ruby-sinatra (>= 1.4.4~),
-# HTTP requests
+         ruby-six (>= 0.2.0~),
- ruby-httparty (>= 0.13.3~),
-# Colored output to console
- ruby-colorize (>= 0.7.0~),
-# GitLab settings
- ruby-settingslogic (>= 2.0.9~),
-# Misc
- ruby-version-sorter (>= 2.0.0~),
-# Cache
- ruby-redis-rails (>= 4.0.0~),
-# Campfire integration
- ruby-tinder (>= 1.10.0~),
-# HipChat integration
- ruby-hipchat (>= 1.5.0~),
-# Flowdock integration
- ruby-gitlab-flowdock-git-hook (>= 1.0.1~),
-# Gemnasium integration
- ruby-gemnasium-gitlab-service (>= 0.2~),
-# Slack integration
          ruby-slack-notifier (>= 1.2.0~),
-# Asana integration
+         ruby-sprockets (>= 3.3.0~),
- ruby-asana (>= 0.4.0~),
+         ruby-state-machines-activerecord (>= 0.3.0~),
-# FogBugz integration
+         ruby-task-list (>= 1.0.2~),
- ruby-fogbugz (>= 0.2.1~),
+         ruby-tinder (>= 1.10.0~),
-# d3
- ruby-d3-rails (>= 3.1~),
-#cal-heatmap
- ruby-cal-heatmap-rails (>= 3.5.1~),
-# underscore-rails
- ruby-underscore-rails (>= 1.4~),
-# Sanitize user input
- ruby-sanitize (>= 2.0~),
- ruby-babosa (>= 1.0.2~),
-# Protect against bruteforcing
- ruby-rack-attack (>= 4.3.1~),
-# Ace editor
- ruby-ace-rails-ap (>= 3.0.3~),
-# Keyboard shortcuts
- ruby-mousetrap-rails (>= 1.4.6~),
-# Detect and convert string character encoding
- ruby-charlock-holmes (>= 0.7.3~),
- ruby-sass-rails (>= 5.0.0~),
- ruby-coffee-rails (>= 4.1.0~),
- ruby-uglifier (>= 2.7.2~),
          ruby-turbolinks (>= 2.5.0~),
- ruby-jquery-turbolinks (>= 2.1.0~),
+         ruby-uglifier (>= 2.7.2~),
- ruby-addressable (>= 2.3.8~),
+         ruby-underscore-rails (>= 1.4~),
- ruby-bootstrap-sass (>= 3.3.0~),
+         ruby-unf (>= 0.1.4),
- ruby-font-awesome-rails (>= 4.2~),
+         ruby-unicorn-worker-killer (>= 0.4.2~),
- ruby-gitlab-emoji (>= 0.2.0~),
+         ruby-version-sorter (>= 2.0.0~),
- ruby-gon (>= 6.0.1~),
- ruby-jquery-atwho-rails (>= 1.3.2~),
- ruby-jquery-rails (>= 4.0.0~),
- ruby-jquery-scrollto-rails (>= 1.4.3~),
- ruby-jquery-ui-rails (>= 5.0.0~),
- ruby-nprogress-rails (>= 0.1.6.7~),
- ruby-raphael-rails (>= 2.1.2~),
- ruby-request-store (>= 1.1~),
- ruby-select2-rails (>= 3.5.9~),
          ruby-virtus (>= 1.0.1~),
- ruby-net-ssh (>= 2.9.2~),
+         ruby-wikicloth (>= 0.8.1~),
-# Metrics
+         unicorn (>= 4.8~),
- ruby-allocations (>= 1.0~),
+         ${misc:Depends},
- ruby-method-source (>= 0.8~),
+         ${shlibs:Depends}
- ruby-influxdb (>= 0.2~),
- ruby-connection-pool (>= 2.0~),
- ruby-sentry-raven,
- ruby-octokit (>= 3.7~),
- ruby-mail-room (>= 0.6.1),
- ruby-email-reply-parser (>= 0.5.8~),
-## CI
- ruby-activerecord-deprecated-finders (>= 1.0.3-2~),
- ruby-activerecord-session-store (>= 0.1.0~),
- ruby-nested-form (>= 0.3.2~),
-# OAuth
- ruby-oauth2 (>= 1.0.0~),
-# Soft deletion
- ruby-paranoia (>= 2.0~),
-# Vendored js files
- libjs-jquery-cookie,
- libjs-jquery-history,
- libjs-jquery-nicescroll,
- libjs-clipboard,
- libjs-chartjs,
- libjs-graphael,
- libjs-fuzzaldrin-plus
 Description: git powered software platform to collaborate on code
  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

debian/gitlab.links

@@ -1,13 +1,13 @@
-var/lib/gitlab/public usr/share/gitlab/public
-var/lib/gitlab/cache usr/share/gitlab/shared/cache
-var/log/gitlab usr/share/gitlab/log
-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
+run/gitlab usr/share/gitlab/tmp
-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/clipboard/clipboard.js usr/share/gitlab/vendor/assets/javascripts/clipboard.js
-usr/share/javascript/graphael/g.bar-min.js usr/share/gitlab/vendor/assets/javascripts/g.bar-min.js
 usr/share/javascript/fuzzaldrin/fuzzaldrin.min.js usr/share/gitlab/vendor/assets/javascripts/fuzzaldrin-plus.min.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/cache usr/share/gitlab/shared/cache
+var/lib/gitlab/public usr/share/gitlab/public
+var/log/gitlab usr/share/gitlab/log

debian/install

@@ -1,39 +1,39 @@
-debian/conf/gitlab etc/default
-debian/conf/unicorn.rb etc/gitlab
-debian/conf/database.yml etc/gitlab
-debian/conf/gitlab.yml etc/gitlab
-debian/conf/resque.yml etc/gitlab
-debian/conf/gitlab-debian.conf etc/gitlab
-debian/conf/*.target lib/systemd/system
-debian/conf/*.service lib/systemd/system
-debian/conf/smtp_settings.rb etc/gitlab/initializers
-debian/conf/tmpfiles.d/gitlab.conf usr/lib/tmpfiles.d
-debian/adduser.sh usr/lib/gitlab/scripts
-debian/grantpriv.sh usr/lib/gitlab/scripts
-debian/rake-tasks.sh usr/lib/gitlab/scripts
-app usr/share/gitlab
-bin usr/share/gitlab
 CHANGELOG usr/share/gitlab
-config/* etc/gitlab
-config.ru usr/share/gitlab
 CONTRIBUTING.md usr/share/gitlab
-db usr/share/gitlab
-doc usr/share/gitlab
-docker usr/share/gitlab
-doc_styleguide.md usr/share/gitlab
-features usr/share/gitlab
-fixtures usr/share/gitlab
-Gemfile usr/share/gitlab
 GITLAB_SHELL_VERSION usr/share/gitlab
 GITLAB_WORKHORSE_VERSION usr/share/gitlab
-lib usr/share/gitlab
+Gemfile usr/share/gitlab
 MAINTENANCE.md usr/share/gitlab
 PROCESS.md usr/share/gitlab
 Procfile usr/share/gitlab
-Rakefile usr/share/gitlab
 README.md usr/share/gitlab
+Rakefile usr/share/gitlab
+VERSION usr/share/gitlab
+app usr/share/gitlab
+bin usr/share/gitlab
+config.ru usr/share/gitlab
+config/* etc/gitlab
+db usr/share/gitlab
+debian/adduser.sh usr/lib/gitlab/scripts
+debian/conf/*.service lib/systemd/system
+debian/conf/*.target lib/systemd/system
+debian/conf/database.yml etc/gitlab
+debian/conf/gitlab etc/default
+debian/conf/gitlab-debian.conf etc/gitlab
+debian/conf/gitlab.yml etc/gitlab
+debian/conf/resque.yml etc/gitlab
+debian/conf/smtp_settings.rb etc/gitlab/initializers
+debian/conf/tmpfiles.d/gitlab.conf usr/lib/tmpfiles.d
+debian/conf/unicorn.rb etc/gitlab
+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
+features usr/share/gitlab
+fixtures usr/share/gitlab
+lib usr/share/gitlab
 scripts usr/share/gitlab
 shared usr/share/gitlab
 spec usr/share/gitlab
 vendor usr/share/gitlab
-VERSION usr/share/gitlab

debian/ruby-gitlab-ce.git.docs

@@ -1,6 +1,6 @@
-# FIXME: doc/ dir found in source. Consider installing the docs.
 # Examples:
+# FIXME: READMEs found
+# FIXME: doc/ dir found in source. Consider installing the docs.
+# README.md
 # doc/manual.html
 # doc/site/*
-# FIXME: READMEs found
-# README.md