From 9f1c3e53aa217057b36c3e8cbe0ad76ca74be681 Mon Sep 17 00:00:00 2001 From: Robin Sheat Date: Tue, 14 Apr 2015 15:28:46 +1200 Subject: [PATCH] Bug 13979: [3.16.x] updates to allow installation on jessie --- debian/control | 6 +----- debian/control.in | 2 -- debian/rules | 8 -------- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/debian/control b/debian/control index e2bd024..5bad979 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,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, @@ -123,7 +122,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 @@ -138,7 +137,6 @@ Depends: ${misc:Depends}, ${koha:Depends}, debconf, idzebra-2.0, libjs-jquery, - libjs-yui, mysql-client, perl-doc, pwgen, @@ -186,7 +184,6 @@ Depends: ${misc:Depends}, debconf, idzebra-2.0, libjs-jquery, - libjs-yui, mysql-client, mysql-server, perl-doc, @@ -228,7 +225,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 8984c6b..70f7e73 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, perl-doc, pwgen, @@ -72,7 +71,6 @@ Depends: ${misc:Depends}, debconf, idzebra-2.0, libjs-jquery, - libjs-yui, mysql-client, mysql-server, perl-doc, diff --git a/debian/rules b/debian/rules index b00b9b8..ec2cd7c 100755 --- a/debian/rules +++ b/debian/rules @@ -27,14 +27,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/intranet/htdocs/intranet-tmpl/prog/en/lib/yui - ln -s /usr/share/javascript/yui \ - $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/lib/yui - 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.1.0