From b4599dad885c6446be85f94ba2014a369736eec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrew=20Lee=20=28=E6=9D=8E=E5=81=A5=E7=A7=8B=29?= <ajqlee@debian.org> Date: Thu, 17 Nov 2016 02:50:47 +0800 Subject: [PATCH] Drop jquery.ui.widget.patch. Update new path in jquery-ui.patch. --- debian/patches/jquery-ui.patch | 25 +++++++++++++++++++++++++ debian/patches/jquery.ui.widget.patch | 18 ------------------ debian/patches/series | 3 ++- 3 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 debian/patches/jquery-ui.patch delete mode 100644 debian/patches/jquery.ui.widget.patch diff --git a/debian/patches/jquery-ui.patch b/debian/patches/jquery-ui.patch new file mode 100644 index 0000000000..94d22e3a0f --- /dev/null +++ b/debian/patches/jquery-ui.patch @@ -0,0 +1,25 @@ +Description: Added missing jquery.ui.widget +Author: Bob Ham <bob.ham@collabora.com> +Origin: Debian +Bug-Debian: https://bugs.debian.org/839144 +Bug-Debian: https://bugs.debian.org/839143 +Reviewed-By: Andrew Lee (李健秋) <ajqlee@debian.org> +Last-Update: 2016-10-20 + +--- a/src/api/app/assets/javascripts/webui/application.js ++++ b/src/api/app/assets/javascripts/webui/application.js +@@ -11,10 +11,10 @@ + // GO AFTER THE REQUIRES BELOW. + // + //= require jquery +-//= require jquery.ui.menu +-//= require jquery.ui.autocomplete +-//= require jquery.ui.tabs +-//= require jquery.ui.tooltip ++//= require jquery-ui/menu ++//= require jquery-ui/autocomplete ++//= require jquery-ui/tabs ++//= require jquery-ui/tooltip + //= require jquery.tokeninput + //= require jquery.flot + //= require jquery.flot.resize diff --git a/debian/patches/jquery.ui.widget.patch b/debian/patches/jquery.ui.widget.patch deleted file mode 100644 index 5fbecb0f6e..0000000000 --- a/debian/patches/jquery.ui.widget.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Added missing jquery.ui.widget -Author: Bob Ham <bob.ham@collabora.com> -Origin: Debian -Bug-Debian: https://bugs.debian.org/839144 -Bug-Debian: https://bugs.debian.org/839143 -Reviewed-By: Andrew Lee (李健秋) <ajqlee@debian.org> -Last-Update: 2016-10-20 - ---- open-build-service-2.7.1.orig/src/api/app/assets/javascripts/webui/application.js -+++ open-build-service-2.7.1/src/api/app/assets/javascripts/webui/application.js -@@ -11,6 +11,7 @@ - // GO AFTER THE REQUIRES BELOW. - // - //= require jquery -+//= require jquery.ui.widget - //= require jquery.ui.menu - //= require jquery.ui.autocomplete - //= require jquery.ui.tabs diff --git a/debian/patches/series b/debian/patches/series index a96ad88219..b442a2d137 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,6 +10,7 @@ Rakefile-fix.patch ruby-interpreter.patch fix-embedded-js.patch fix-privacy-breach-piwik.patch -jquery.ui.widget.patch +jquery-ui.patch missing-codemirror-js.patch Do-not-ship-database.yml.patch +localgem.patch -- GitLab