From a71de16a9d51aaf3d4e21c4b898b40575a97aa9b Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 12 May 2020 14:19:53 -0400 Subject: [PATCH] Bug 25485: TinyMCE broken in Debian package installs When installing the Debian package of Koha, we install the Debian tinymce package and symlink over our own tinymce libs that are in the Koha codebase. This version of tinymce does not have the same files and because of this, tinymce does not get loaded. We should remove the use of the tinymce Debian package, and just use our own version of TinyMCE. Test Plan: 1) Install Koha 19.11 from package 2) Browse to the news editor 4) Note the WYSIWYG editor is missing 5) Build a new Koha package with this patch applied, install it 6) Reload the news editor 7) Note the WYSIWYG editor is back! Signed-off-by: David Cook --- debian/control.in | 2 -- debian/rules | 2 -- 2 files changed, 4 deletions(-) diff --git a/debian/control.in b/debian/control.in index 7ad20b110b..9ab6b8062d 100644 --- a/debian/control.in +++ b/debian/control.in @@ -30,7 +30,6 @@ Depends: ${misc:Depends}, ${koha:Depends}, pwgen, starman, sudo, - tinymce, ttf-dejavu, unzip, xmlstarlet, @@ -80,7 +79,6 @@ Depends: ${misc:Depends}, pwgen, starman, sudo, - tinymce, ttf-dejavu, unzip, xmlstarlet, diff --git a/debian/rules b/debian/rules index 00830ccf75..72acb813b6 100755 --- a/debian/rules +++ b/debian/rules @@ -23,8 +23,6 @@ override_dh_auto_install: rm $(TMP)/var/log/koha/README rm -r \ $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/lib/tiny_mce - ln -s /usr/share/tinymce/www \ - $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/lib/tiny_mce install -d $(TMP)/etc/apache2/sites-available install -d $(TMP)/etc/apache2/sites-enabled install -d $(TMP)/etc/apache2/conf.d -- 2.11.0