From f5fb587df425638ae78474c78ee188f1617b062e Mon Sep 17 00:00:00 2001 From: Robin Sheat Date: Tue, 14 Apr 2015 15:28:46 +1200 Subject: [PATCH] [PASSED QA] Bug 13979: [3.18.x] 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 | 6 +----- debian/control.in | 2 -- debian/rules | 4 ---- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/debian/control b/debian/control index 96a6650..e5d1040 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, @@ -124,7 +123,7 @@ Build-Depends: libalgorithm-checkdigits-perl, libyaml-perl, libyaml-syck-perl, perl, - perl-modules, + perl-modules, debhelper (>= 7.0.50), gettext, python, python-debian, xsltproc, docbook-xsl, libxml2-utils, bash-completion, perl-modules (>= 5.14.2) | libtest-simple-perl (>= 0.98) @@ -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 66ebc4c..365b476 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 525cc0d..ca5ac4e 100755 --- a/debian/rules +++ b/debian/rules @@ -24,10 +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 - rm -r \ - $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/lib/yui - 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