Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package diaspora. Fixes grave functionality bugs (breaks user interface, core functionality. All buttons and drop downs broken, cannot post anything.) #846916 It is also affected by breaking changes in libjs-jquery-ui/ruby-jquery-ui-rails, as described in #846961 debdiff attached unblock diaspora/0.6.0.0+debian-7 -- System Information: Debian Release: stretch/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: amd64 (x86_64) Kernel: Linux 4.8.0-1-amd64 (SMP w/4 CPU cores) Locale: LANG=ml_IN.UTF-8, LC_CTYPE=ml_IN.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
diff -Nru diaspora-0.6.0.0+debian/debian/changelog
diaspora-0.6.0.0+debian/debian/changelog
--- diaspora-0.6.0.0+debian/debian/changelog 2016-11-24 11:16:10.000000000
+0530
+++ diaspora-0.6.0.0+debian/debian/changelog 2016-12-12 11:18:48.000000000
+0530
@@ -1,3 +1,15 @@
+diaspora (0.6.0.0+debian-7) unstable; urgency=medium
+
+ * Use jquery-ui 6 (See #846961)
+
+ -- Pirate Praveen <prav...@debian.org> Mon, 12 Dec 2016 11:18:48 +0530
+
+diaspora (0.6.0.0+debian-6) unstable; urgency=medium
+
+ * Switch back to jquery 2 (ruby-jquery-rails now provides jquery 2)
+
+ -- Pirate Praveen <prav...@debian.org> Wed, 07 Dec 2016 23:18:41 +0530
+
diaspora (0.6.0.0+debian-5) unstable; urgency=medium
* Remove dependency on ruby-rails-autolink (removed upstream)
diff -Nru diaspora-0.6.0.0+debian/debian/control
diaspora-0.6.0.0+debian/debian/control
--- diaspora-0.6.0.0+debian/debian/control 2016-11-24 11:16:10.000000000
+0530
+++ diaspora-0.6.0.0+debian/debian/control 2016-12-07 23:18:02.000000000
+0530
@@ -101,7 +101,7 @@
ruby-uglifier (>= 2.7.2~),
ruby-backbone-on-rails (>= 1.2.0.0~),
ruby-handlebars-assets (>= 2:0.23.1~),
- ruby-jquery-rails (>= 4.2.1~),
+ ruby-jquery-rails (>= 4.2.1-2~),
ruby-jquery-ui-rails (>= 5.0.5~),
ruby-js-image-paths (>= 0.1~),
ruby-js-routes (>= 1.2.4~),
diff -Nru diaspora-0.6.0.0+debian/debian/patches/0120-jquery-ui-6.patch
diaspora-0.6.0.0+debian/debian/patches/0120-jquery-ui-6.patch
--- diaspora-0.6.0.0+debian/debian/patches/0120-jquery-ui-6.patch
1970-01-01 05:30:00.000000000 +0530
+++ diaspora-0.6.0.0+debian/debian/patches/0120-jquery-ui-6.patch
2016-12-12 11:16:54.000000000 +0530
@@ -0,0 +1,24 @@
+--- a/Gemfile
++++ b/Gemfile
+@@ -96,7 +96,7 @@
+ gem "backbone-on-rails", "~> 1.2"
+ gem "handlebars_assets", "~> 0.23.1"
+ gem "jquery-rails", "~> 4.1", ">= 4.1.1"
+-gem "jquery-ui-rails", "~> 5.0", ">= 5.0.5"
++gem "jquery-ui-rails", "~> 6.0"
+ gem "js_image_paths", "~> 0.1.0"
+ gem "js-routes", "~> 1.2", ">= 1.2.9"
+
+--- a/app/assets/javascripts/main.js
++++ b/app/assets/javascripts/main.js
+@@ -15,8 +15,8 @@
+ //= require jquery.infinitescroll-custom
+ //= require jquery-ui/core
+ //= require jquery-ui/widget
+-//= require jquery-ui/mouse
+-//= require jquery-ui/sortable
++//= require jquery-ui/widgets/mouse
++//= require jquery-ui/widgets/sortable
+ //= require keycodes
+ //= require fileuploader-custom
+ //= require handlebars.runtime
diff -Nru diaspora-0.6.0.0+debian/debian/patches/0120-use-jquery-3.patch
diaspora-0.6.0.0+debian/debian/patches/0120-use-jquery-3.patch
--- diaspora-0.6.0.0+debian/debian/patches/0120-use-jquery-3.patch
2016-11-24 11:16:10.000000000 +0530
+++ diaspora-0.6.0.0+debian/debian/patches/0120-use-jquery-3.patch
1970-01-01 05:30:00.000000000 +0530
@@ -1,67 +0,0 @@
-From 657d06c49061a499b93ca0e43f35b70cad785a3b Mon Sep 17 00:00:00 2001
-From: cmrd Senya <se...@riseup.net>
-Date: Thu, 10 Nov 2016 17:46:31 +0200
-Subject: [PATCH] jQuery 3 integration
-
----
- app/assets/javascripts/jasmine-load-all.js | 2 +-
- app/helpers/application_helper.rb | 8 +++++---
- config/application.rb | 2 +-
- spec/helpers/application_helper_spec.rb | 2 +-
- 6 files changed, 12 insertions(+), 10 deletions(-)
-
-Index: diaspora/app/assets/javascripts/jasmine-load-all.js
-===================================================================
---- diaspora.orig/app/assets/javascripts/jasmine-load-all.js
-+++ diaspora/app/assets/javascripts/jasmine-load-all.js
-@@ -1,4 +1,4 @@
--//= require jquery2
-+//= require jquery3
- //= require handlebars.runtime
- //= require templates
- //= require main
-Index: diaspora/app/helpers/application_helper.rb
-===================================================================
---- diaspora.orig/app/helpers/application_helper.rb
-+++ diaspora/app/helpers/application_helper.rb
-@@ -52,11 +52,11 @@ module ApplicationHelper
- def jquery_include_tag
- buf = []
- if AppConfig.privacy.jquery_cdn?
-- version = Jquery::Rails::JQUERY_2_VERSION
-+ version = Jquery::Rails::JQUERY_3_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('jquery3')}'));")]
- else
-- buf << [javascript_include_tag("jquery2")]
-+ buf << [javascript_include_tag("jquery3")]
- end
- buf << [ javascript_include_tag('jquery_ujs') ]
- buf << [ javascript_tag("jQuery.ajaxSetup({'cache': false});") ]
-Index: diaspora/config/application.rb
-===================================================================
---- diaspora.orig/config/application.rb
-+++ diaspora/config/application.rb
-@@ -70,7 +70,7 @@ module Diaspora
- contact-list.js
- ie.js
- inbox.js
-- jquery2.js
-+ jquery3.js
- jquery_ujs.js
- jquery-textchange.js
- main.js
-Index: diaspora/spec/helpers/application_helper_spec.rb
-===================================================================
---- diaspora.orig/spec/helpers/application_helper_spec.rb
-+++ diaspora/spec/helpers/application_helper_spec.rb
-@@ -74,7 +74,7 @@ describe ApplicationHelper, :type => :he
- end
-
- it 'includes jquery.js from asset pipeline' do
-- expect(jquery_include_tag).to match(/jquery2\.js/)
-+ expect(jquery_include_tag).to match(/jquery3\.js/)
- expect(jquery_include_tag).not_to match(/jquery\.com/)
- end
- end
diff -Nru diaspora-0.6.0.0+debian/debian/patches/series
diaspora-0.6.0.0+debian/debian/patches/series
--- diaspora-0.6.0.0+debian/debian/patches/series 2016-11-24
11:16:10.000000000 +0530
+++ diaspora-0.6.0.0+debian/debian/patches/series 2016-12-12
11:14:22.000000000 +0530
@@ -6,3 +6,4 @@
060-use-db-env.patch
0100-set-rails-root.patch
0110-remove-stop-all-from-eye.patch
+0120-jquery-ui-6.patch
signature.asc
Description: OpenPGP digital signature
