From 55f3553b25629cb24643dafd004786fe05629d81 Mon Sep 17 00:00:00 2001 From: Robin Sheat Date: Wed, 29 May 2013 16:44:43 +1200 Subject: [PATCH] Bug 10367 - update the rules and control file for wheezy This updates the control file to use tinymce rather than tinymce2, as tinymce2 is deprecated and no longer in Debian. Also a general dependencies update. Note that this is suitable for master only. Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton --- debian/control | 8 ++++++-- debian/control.in | 4 ++-- debian/rules | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control index fe69e1e947..35024f855e 100644 --- a/debian/control +++ b/debian/control @@ -43,6 +43,7 @@ Build-Depends: libalgorithm-checkdigits-perl, libdigest-sha-perl | perl, libemail-date-perl, libfile-path-perl | perl-modules, + libfile-slurp-perl, libgd-barcode-perl, libgd-gd2-noxpm-perl | libgd-gd2-perl, libgraphics-magick-perl, @@ -94,6 +95,7 @@ Build-Depends: libalgorithm-checkdigits-perl, libtest-simple-perl | perl-modules, libtest-strict-perl, libtest-warn-perl, + libtest-www-mechanize-perl, libtest-yaml-valid-perl, libtext-csv-encoded-perl, libtext-csv-perl, @@ -133,7 +135,7 @@ Depends: ${misc:Depends}, ${koha:Depends}, perl-doc, pwgen, sudo, - tinymce2, + tinymce, unzip, xmlstarlet, yaz @@ -179,7 +181,7 @@ Depends: ${misc:Depends}, perl-doc, pwgen, sudo, - tinymce2, + tinymce, unzip, xmlstarlet, yaz @@ -226,6 +228,7 @@ Depends: libalgorithm-checkdigits-perl, libdigest-sha-perl | perl, libemail-date-perl, libfile-path-perl | perl-modules, + libfile-slurp-perl, libgd-barcode-perl, libgd-gd2-noxpm-perl | libgd-gd2-perl, libgraphics-magick-perl, @@ -277,6 +280,7 @@ Depends: libalgorithm-checkdigits-perl, libtest-simple-perl | perl-modules, libtest-strict-perl, libtest-warn-perl, + libtest-www-mechanize-perl, libtest-yaml-valid-perl, libtext-csv-encoded-perl, libtext-csv-perl, diff --git a/debian/control.in b/debian/control.in index 0fd9d44161..e2b88827dd 100644 --- a/debian/control.in +++ b/debian/control.in @@ -28,7 +28,7 @@ Depends: ${misc:Depends}, ${koha:Depends}, perl-doc, pwgen, sudo, - tinymce2, + tinymce, unzip, xmlstarlet, yaz @@ -74,7 +74,7 @@ Depends: ${misc:Depends}, perl-doc, pwgen, sudo, - tinymce2, + tinymce, unzip, xmlstarlet, yaz diff --git a/debian/rules b/debian/rules index aee34bad31..cbcfaafd4e 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,7 @@ override_dh_auto_install: rm $(TMP)/etc/koha/solr/indexes.yaml rm -r \ $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/lib/tiny_mce - ln -s /usr/share/tinymce2/www \ + 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 -- 2.39.5