[DRE-commits] [diaspora] 02/04: jquery-rails now provide jquery2

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository diaspora.

commit 77a5528cd178caf79fa0ca9c4fa6292baf6f393e
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Nov 9 12:46:54 2016 +0530

    jquery-rails now provide jquery2
---
 debian/control                        |  2 +-
 debian/patches/070-relax-jquery.patch | 25 -------------------------
 debian/patches/series                 |  1 -
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/debian/control b/debian/control
index 600b662..9429196 100644
--- a/debian/control
+++ b/debian/control
@@ -102,7 +102,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-uglifier (>= 2.7.2~),
  ruby-backbone-on-rails (>= 1.2.0.0~),
  ruby-handlebars-assets (>= 2:0.23~),
- ruby-jquery-rails (>= 4.0.5~),
+ ruby-jquery-rails (>= 4.2.1~),
  ruby-jquery-ui-rails (>= 5.0.5~),
  ruby-js-image-paths (>= 0.1~),
  ruby-js-routes (>= 1.2.4~),
diff --git a/debian/patches/070-relax-jquery.patch b/debian/patches/070-relax-jquery.patch
deleted file mode 100644
index a8b5b47..0000000
--- a/debian/patches/070-relax-jquery.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/app/helpers/application_helper.rb
-+++ b/app/helpers/application_helper.rb
-@@ -54,9 +54,9 @@
-     if AppConfig.privacy.jquery_cdn?
-       version = Jquery::Rails::JQUERY_2_VERSION
-       buf << [ javascript_include_tag("//code.jquery.com/jquery-#{version}.min.js") ]
--      buf << [javascript_tag("!window.jQuery && document.write(unescape('#{j javascript_include_tag('jquery2')}'));")]
-+      buf << [javascript_tag("!window.jQuery && document.write(unescape('#{j javascript_include_tag('jquery')}'));")]
-     else
--      buf << [javascript_include_tag("jquery2")]
-+      buf << [javascript_include_tag("jquery")]
-     end
-     buf << [ javascript_include_tag('jquery_ujs') ]
-     buf << [ javascript_tag("jQuery.ajaxSetup({'cache': false});") ]
---- a/config/application.rb
-+++ b/config/application.rb
-@@ -70,7 +70,7 @@
-       contact-list.js
-       ie.js
-       inbox.js
--      jquery2.js
-+      jquery.js
-       jquery_ujs.js
-       jquery-textchange.js
-       main.js
diff --git a/debian/patches/series b/debian/patches/series
index fa3bddc..494fcdd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,5 @@
 050-relax-libs.patch
 051-relax-eye.patch
 060-use-db-env.patch
-070-relax-jquery.patch
 0100-set-rails-root.patch
 0110-remove-stop-all-from-eye.patch

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