gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <josef.moravec@gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
This commit is contained in:
Robin Sheat 2015-04-14 15:28:46 +12:00 committed by Chris Cormack
parent 436dc9b931
commit 95d8d892a4
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/control vendored
View File

@ -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,

2
debian/control.in vendored
View File

@ -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,

4
debian/rules vendored
View File

@ -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