[DRE-commits] [gitlab] 02/02: tighten dependencies

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository gitlab.

commit c73c4cab7d2436b753c1ff99e367630841b9c3ae
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Nov 4 00:24:53 2016 +0530

    tighten dependencies
---
 debian/control                                   | 21 +++++++++++----------
 debian/patches/0200-use-jquery-for-jquery2.patch | 14 --------------
 debian/patches/series                            |  1 -
 3 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/debian/control b/debian/control
index ee7fc34..967da10 100644
--- a/debian/control
+++ b/debian/control
@@ -31,13 +31,13 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  openssh-client,
  ucf,
  gitlab-shell (>= 3.6~),
- gitlab-workhorse (>= 0.8.2~),
+ 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,
+ ruby-sprockets-es6 (>= 0.9.2~),
  ruby-default-value-for (>= 3~),
 #ruby-mysql2 | ruby-pg,
  ruby-pg (>= 0.18.4~),
@@ -54,7 +54,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-omniauth-gitlab (>= 1.0.0~),
  ruby-omniauth-google-oauth2 (>= 0.4.1~),
  ruby-omniauth-kerberos (>= 0.3.0-3~),
- ruby-omniauth-saml (>= 1.6.0~),
+ ruby-omniauth-saml (>= 1.7.0~),
  ruby-omniauth-shibboleth (>= 1.2.0~),
  ruby-omniauth-twitter (>= 1.2.0~),
  ruby-omniauth-crowd (>= 2.2.0~),
@@ -70,7 +70,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
 # Browser detection
  ruby-browser (>= 2.2~),
 # Extracting information from a git repository
- ruby-gitlab-git (>= 10.4.7~),
+ ruby-gitlab-git (>= 10.6.8~),
 # LDAP Auth
 # Debian package includes gitlab patches
  ruby-omniauth-ldap (>= 1.0.4~),
@@ -107,8 +107,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
 # Markdown and HTML processing
  ruby-htmlentities (>= 4.3.3~),
  ruby-html-pipeline (>= 1.11.0),
- ruby-task-list (>= 1.0.2~),
- ruby-github-markup (>= 1.3.1~),
+ ruby-task-list (>= 1.0.5~),
+ ruby-github-markup (>= 1.5~),
  ruby-redcarpet (>= 3.3.4~),
  ruby-redcloth (>= 4.3.2~),
  ruby-org (>= 0.9.12-2~),
@@ -116,21 +116,22 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  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.0.1~),
+ 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 (>= 3.4~),
+ ruby-acts-as-taggable-on (>= 4.0~),
 # Background jobs
  ruby-sinatra (>= 1.4.7-4~),
- ruby-sidekiq (>= 4.0~),
+ ruby-sidekiq (>= 4.2~),
  ruby-sidekiq-cron (>= 0.4.0~),
  ruby-redis-namespace,
 # HTTP requests
@@ -195,7 +196,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-gemojione (>= 3.0~),
  ruby-gon (>= 6.1~),
  ruby-jquery-atwho-rails (>= 1.3.2~),
- ruby-jquery-rails (>= 4.0.0~),
+ ruby-jquery-rails (>= 4.1~),
  ruby-jquery-scrollto-rails (>= 1.4.3~),
  ruby-jquery-ui-rails (>= 5.0.0~),
  ruby-nprogress-rails (>= 0.1.6.7~),
diff --git a/debian/patches/0200-use-jquery-for-jquery2.patch b/debian/patches/0200-use-jquery-for-jquery2.patch
deleted file mode 100644
index 19c6f3b..0000000
--- a/debian/patches/0200-use-jquery-for-jquery2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-jquery 1.x and 2.x use same api
-http://lists.alioth.debian.org/pipermail/pkg-javascript-devel/2015-September/011230.html
-
---- a/app/assets/javascripts/application.js
-+++ b/app/assets/javascripts/application.js
-@@ -4,7 +4,7 @@
- // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
- // the compiled file.
- //
--/*= require jquery2 */
-+/*= require jquery */
- /*= require jquery-ui/autocomplete */
- /*= require jquery-ui/datepicker */
- /*= require jquery-ui/draggable */
diff --git a/debian/patches/series b/debian/patches/series
index 6e941a3..785d691 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,5 @@
 0108-make-mysql-optional.patch
 source-init-functions.patch
 pid-log-paths.patch
-0200-use-jquery-for-jquery2.patch
 052-relax-grape.patch
 053-relax-omniauth-facebook.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git