Bug#927096: redmine/4.0.1-2

[Marc Dequènes (duck) <duck@duckcorp.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-CC: Lucas Kanashiro <kanashiro@debian.org>


Quack,

This is a follow-up on #923256. RC bugs were discovered and are now 
fixed (debdiff attached).

Please,
  unblock redmine/4.0.1-2

Regards.
\_o<

--
Marc Dequènes

diff -Nru redmine-4.0.1/debian/changelog redmine-4.0.1/debian/changelog
--- redmine-4.0.1/debian/changelog	2019-02-18 22:03:45.000000000 +0900
+++ redmine-4.0.1/debian/changelog	2019-04-15 12:47:36.000000000 +0900
@@ -1,3 +1,16 @@
+redmine (4.0.1-2) unstable; urgency=medium
+
+  * fix use_system_jquery_libs.patch (Closes: #923891):
+    + avoid loading libs multiple times
+    + correct event loading for JQuery 3
+  * conflicts with incompatible plugins (Closes: #923843):
+    + redmine-plugin-pretend: unmaintained, no replacement
+    + redmine-plugin-recaptcha: unmaintained, another fork may work
+    + redmine-plugin-local-avatars: unmaintained, pending PR may work,
+        see #924110
+
+ -- Marc Dequènes (Duck) <Duck@DuckCorp.org>  Mon, 15 Apr 2019 12:47:36 +0900
+
 redmine (4.0.1-1) unstable; urgency=medium
 
   [ Marc Dequènes (Duck) ]
diff -Nru redmine-4.0.1/debian/control redmine-4.0.1/debian/control
--- redmine-4.0.1/debian/control	2019-02-18 22:03:45.000000000 +0900
+++ redmine-4.0.1/debian/control	2019-04-15 12:45:55.000000000 +0900
@@ -78,6 +78,9 @@
          ${misc:Depends}
 Breaks: redmine-plugin-botsfilter (<=1.02-2),
         redmine-plugin-recaptcha (<=0.1.0+git20121018)
+Conflicts: redmine-plugin-pretend (<= 0.0.2+git20130821-4),
+           redmine-plugin-recaptcha (<= 0.1.0+git20121018-3),
+           redmine-plugin-local-avatars (<= 1.0.1-1)
 Recommends: passenger
 Suggests: bzr,
           cvs,
diff -Nru redmine-4.0.1/debian/patches/use_system_jquery_libs.patch redmine-4.0.1/debian/patches/use_system_jquery_libs.patch
--- redmine-4.0.1/debian/patches/use_system_jquery_libs.patch	2019-02-18 22:03:45.000000000 +0900
+++ redmine-4.0.1/debian/patches/use_system_jquery_libs.patch	2019-04-15 12:45:55.000000000 +0900
@@ -1,15 +1,14 @@
-Index: redmine/app/helpers/application_helper.rb
-===================================================================
---- redmine.orig/app/helpers/application_helper.rb
-+++ redmine/app/helpers/application_helper.rb
-@@ -1502,7 +1502,9 @@ module ApplicationHelper
+--- a/app/helpers/application_helper.rb
++++ b/app/helpers/application_helper.rb
+@@ -1502,9 +1502,9 @@
  
    # Returns the javascript tags that are included in the html layout head
    def javascript_heads
 -    tags = javascript_include_tag('jquery-1.11.1-ui-1.11.0-ujs-4.3.1', 'application', 'responsive')
-+    tags = javascript_include_tag('jquery.min.js', 'application', 'responsive')
-+    tags << javascript_include_tag('jquery_ujs.js', 'application', 'responsive')
-+    tags << javascript_include_tag('jquery-ui.min.js', 'application', 'responsive')
++    tags = javascript_include_tag('jquery.min.js', 'jquery-ui.min.js', 'jquery_ujs.js', 'application', 'responsive')
      unless User.current.pref.warn_on_leaving_unsaved == '0'
-       tags << "\n".html_safe + javascript_tag("$(window).load(function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });")
+-      tags << "\n".html_safe + javascript_tag("$(window).load(function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });")
++      tags << "\n".html_safe + javascript_tag("$(window).on('load', function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });")
      end
+     tags
+   end