From 4cdffd6a7323c48f5170555328a6784addabd9cc Mon Sep 17 00:00:00 2001 From: Robin Sheat Date: Thu, 30 May 2013 15:32:57 +1200 Subject: [PATCH] Bug 10367 - [3.10] 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. --- debian/control | 6 ++---- debian/control.in | 4 ++-- debian/rules | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/debian/control b/debian/control index 8805c6d..1c12673 100644 --- a/debian/control +++ b/debian/control @@ -79,7 +79,6 @@ Build-Depends: libalgorithm-checkdigits-perl, libscalar-list-utils-perl, libschedule-at-perl, libsms-send-perl, - libstring-random-perl, libstring-rewriteprefix-perl, libtemplate-perl, libtemplate-plugin-htmltotext-perl, @@ -127,7 +126,7 @@ Depends: ${misc:Depends}, ${koha:Depends}, perl-doc, pwgen, sudo, - tinymce2, + tinymce, unzip, xmlstarlet, yaz @@ -173,7 +172,7 @@ Depends: ${misc:Depends}, perl-doc, pwgen, sudo, - tinymce2, + tinymce, unzip, xmlstarlet, yaz @@ -256,7 +255,6 @@ Depends: libalgorithm-checkdigits-perl, libscalar-list-utils-perl, libschedule-at-perl, libsms-send-perl, - libstring-random-perl, libstring-rewriteprefix-perl, libtemplate-perl, libtemplate-plugin-htmltotext-perl, diff --git a/debian/control.in b/debian/control.in index 0fd9d44..e2b8882 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 551cf22..3f40782 100755 --- a/debian/rules +++ b/debian/rules @@ -26,7 +26,7 @@ override_dh_auto_install: rm -r \ $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/js/tinymce mkdir -p $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/js/tinymce/jscripts - ln -s /usr/share/tinymce2/www \ + ln -s /usr/share/tinymce/www \ $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/js/tinymce/jscripts/tiny_mce rm -r \ $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/lib/yui -- 1.7.10.4