From b3f348effb653252741e3e1e2798283bde467b48 Mon Sep 17 00:00:00 2001 From: Robin Sheat Date: Tue, 14 Apr 2015 14:21:40 +1200 Subject: [PATCH] [PASSED QA] Bug 13979: updates to allow installation on jessie This patch makes the build script keep the shipped YUI JavaScript library instead of explicitly deleting it and using the one the operating system provides. Development is done against the YUI library we ship, so this makes sense even if Debian still shipped it. Signed-off-by: Josef Moravec Signed-off-by: Tomas Cohen Arazi --- debian/control | 4 ---- debian/control.in | 2 -- debian/rules | 2 -- 3 files changed, 8 deletions(-) diff --git a/debian/control b/debian/control index 0d923b7..74ebe33 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,6 @@ Build-Depends: libalgorithm-checkdigits-perl, libdate-calc-perl, libdate-manip-perl, libdatetime-event-ical-perl, - libdatetime-format-dateparse-perl, libdatetime-format-ical-perl, libdatetime-format-mysql-perl, libdatetime-perl, @@ -139,7 +138,6 @@ Depends: ${misc:Depends}, ${koha:Depends}, debconf, idzebra-2.0, libjs-jquery, - libjs-yui, mysql-client | virtual-mysql-client, perl-doc, pwgen, @@ -187,7 +185,6 @@ Depends: ${misc:Depends}, debconf, idzebra-2.0, libjs-jquery, - libjs-yui, mysql-client | virtual-mysql-client, mysql-server | virtual-mysql-server, perl-doc, @@ -230,7 +227,6 @@ Depends: libalgorithm-checkdigits-perl, libdate-calc-perl, libdate-manip-perl, libdatetime-event-ical-perl, - libdatetime-format-dateparse-perl, libdatetime-format-ical-perl, libdatetime-format-mysql-perl, libdatetime-perl, diff --git a/debian/control.in b/debian/control.in index 9f404d6..e23c8b3 100644 --- a/debian/control.in +++ b/debian/control.in @@ -24,7 +24,6 @@ Depends: ${misc:Depends}, ${koha:Depends}, debconf, idzebra-2.0, libjs-jquery, - libjs-yui, mysql-client | virtual-mysql-client, perl-doc, pwgen, @@ -72,7 +71,6 @@ Depends: ${misc:Depends}, debconf, idzebra-2.0, libjs-jquery, - libjs-yui, mysql-client | virtual-mysql-client, mysql-server | virtual-mysql-server, perl-doc, diff --git a/debian/rules b/debian/rules index a86427c..ca5ac4e 100755 --- a/debian/rules +++ b/debian/rules @@ -24,8 +24,6 @@ override_dh_auto_install: $(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 - ln -s /usr/share/javascript/yui \ - $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/lib/yui install -d $(TMP)/etc/apache2/sites-available install -d $(TMP)/etc/apache2/sites-enabled install -d $(TMP)/etc/apache2/conf.d -- 2.3.5