From ad3c688451df0cd3ed4dc6b4a1171a13a4af6767 Mon Sep 17 00:00:00 2001 From: Robin Sheat Date: Fri, 25 Jul 2014 16:09:49 +1200 Subject: [PATCH] Bug 12657 - remove references to prog and ccsr from the packages To test: * Build a package and install it, and verify that there are no errors. * Play around with koha-translate, listing, adding, and removing languages. Note: one reference to prog and ccsr remains in koha-translate. This is to allow it to remove any pre-existing translations on an upgrade. Note 2: prog translations are still being installed, I think this is due to the underlying translation system doing it. Signed-off-by: Brendan Gallagher Signed-off-by: Chris Cormack --- debian/rules | 51 ----------------------------------- debian/scripts/koha-translate | 15 ++++++----- 2 files changed, 8 insertions(+), 58 deletions(-) diff --git a/debian/rules b/debian/rules index dc6ce6a543..7c57acd51b 100755 --- a/debian/rules +++ b/debian/rules @@ -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/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 \ @@ -44,57 +40,10 @@ override_dh_auto_install: sed -i $(TMP)/usr/share/koha/koha-conf.xml.in \ -e '/^ /s/>.*_DBC_DBUSER_/s/>.*_DBC_DBPASS_ /dev/null ) | \ + sort | uniq | \ + grep -v -e images -e itemtypeimg -x -e en -e css -e js -e less -e lib } install_lang() @@ -153,6 +155,7 @@ remove_lang() if print_installed | grep -q $lang; then rm -rf $KOHA_INSTALL_DIR/opac/htdocs/opac-tmpl/prog/$lang rm -rf $KOHA_INSTALL_DIR/opac/htdocs/opac-tmpl/ccsr/$lang + rm -rf $KOHA_INSTALL_DIR/opac/htdocs/opac-tmpl/bootstrap/$lang rm -rf $KOHA_INSTALL_DIR/intranet/htdocs/intranet-tmpl/prog/$lang else die "Error: the selected language is not already installed." @@ -166,9 +169,7 @@ check_lang_po_files() { lang=$1 - po_files="$PO_DIR/$lang-i-opac-t-prog-v-3006000.po - $PO_DIR/$lang-opac-ccsr.po - $PO_DIR/$lang-i-staff-t-prog-v-3006000.po + po_files="$PO_DIR/$lang-opac-bootstrap.po $PO_DIR/$lang-pref.po" if [ "$lang" != "" ]; then -- 2.39.5