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 <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/debian/control b/debian/control
index fe69e1e..35024f8 100644 (file)
--- 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 0fd9d44..e2b8882 100644 (file)
--- 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 aee34ba..cbcfaaf 100755 (executable)
--- 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