Attachment 31686 Details for Bug 12657 – Bug 12657 - remove references to prog and ccsr from the packages

[patch] Bug 12657 - remove references to prog and ccsr from the packages

Bug-12657---remove-references-to-prog-and-ccsr-fro.patch (text/plain), 7.20 KB, created by Brendan Gallagher on 2014-09-17 21:54:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brendan Gallagher

Created: 2014-09-17 21:54:31 UTC

Size: 7.20 KB

patch

obsolete

>From ee4f46b4ee8abb0c4a6eb370f1b69a170c6addb5 Mon Sep 17 00:00:00 2001
>From: Robin Sheat <robin@catalyst.net.nz>
>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 <brendan@bywatersolutions.com>
>---
> debian/rules                  |   51 -----------------------------------------
> debian/scripts/koha-translate |   15 ++++++------
> 2 files changed, 8 insertions(+), 58 deletions(-)
>
>diff --git a/debian/rules b/debian/rules
>index b00b9b8..c837a19 100755
>--- a/debian/rules
>+++ b/debian/rules
>@@ -28,10 +28,6 @@ override_dh_auto_install:
> 	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
>@@ -47,57 +43,10 @@ override_dh_auto_install:
> 	sed -i $(TMP)/usr/share/koha/koha-conf.xml.in \
> 		-e '/^ <user>/s/>.*</>_DBC_DBUSER_</' \
> 		-e '/^ <pass>/s/>.*</>_DBC_DBPASS_</'
>-	install -m 0644 koha-tmpl/opac-tmpl/lib/yui/skin.css \
>-         koha-tmpl/opac-tmpl/lib/yui/reset-fonts-grids.css \
>-		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
>-	install -m 0644 koha-tmpl/opac-tmpl/lib/yui/skin.css \
>-         koha-tmpl/opac-tmpl/lib/yui/reset-fonts-grids.css \
>-		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
>-	install -m 0644 koha-tmpl/opac-tmpl/lib/yui/skin.css \
>-         koha-tmpl/opac-tmpl/lib/yui/reset-fonts-grids.css \
>-		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/ccsr/en/css
>-	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow-disabled.png \
>-		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
>-	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow-disabled.png \
>-		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
>-	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow.png \
>-		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
>-	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow.png \
>-		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
>-	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-active.png \
>-		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
>-	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-active.png \
>-		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
>-	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-disabled.png \
>-		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
>-	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-disabled.png \
>-		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
>-	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-focus.png \
>-		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
>-	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-focus.png \
>-		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
>-	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-hover.png \
>-		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
>-	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-hover.png \
>-		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
>-	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow.png \
>-		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
>-	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow.png \
>-		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
>-	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/sprite.png \
>-		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
>-	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/sprite.png  \
>-		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
> 	sed -i -e 's:url(.*/reset-fonts-grids.css.*):url("/opac-tmpl/lib/yui/reset-fonts-grids/reset-fonts-grids.css"):' \
> 		   -e 's:url(.*/skin.css.*):url("/opac-tmpl/lib/yui/assets/skins/sam/skin.css"):' \
> 		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/*/en/css/opac.css \
> 		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/*/en/css/sco.css
>-	sed -i -e 's:href="/opac-tmpl/lib/yui/reset-fonts-grids.css":href="/opac-tmpl/lib/yui/reset-fonts-grids/reset-fonts-grids.css":' \
>-		   -e 's:href="/opac-tmpl/lib/yui/skin.css":href="/opac-tmpl/lib/yui/assets/skins/sam/skin.css":' \
>-        $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/ccsr/en/includes/doc-head-close.inc
>-	sed -i -e 's:url(.*/reset-fonts-grids.css.*):url(reset-fonts-grids.css):' \
>-		   -e 's:url(.*/skin.css.*):url(skin.css):' \
>-		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css/staff-global*.css
> 	mkdir -p $(TMP)/debian/tmp_docbook
> 	xt/verify-debian-docbook.t
> 	xsltproc --output $(TMP)/debian/tmp_docbook/ \
>diff --git a/debian/scripts/koha-translate b/debian/scripts/koha-translate
>index 16ae5cf..88f90e8 100755
>--- a/debian/scripts/koha-translate
>+++ b/debian/scripts/koha-translate
>@@ -72,16 +72,18 @@ list()
> print_available()
> {
>     # Loop over only one opac theme
>-    for i in $( ls $PO_DIR | grep opac-t-prog ); do
>-        echo `basename $i -i-opac-t-prog-v-3006000.po` | \
>+    for i in $( ls $PO_DIR | grep opac-bootstrap ); do
>+        echo `basename $i -i-opac-bootstrap.po` | \
>             grep -v -x -e en
>     done
> }
> 
> print_installed()
> {
>-    ls $KOHA_INSTALL_DIR/opac/htdocs/opac-tmpl/prog/ | \
>-        grep -v -e images -e itemtypeimg -x -e en
>+    ( ls -1 $KOHA_INSTALL_DIR/opac/htdocs/opac-tmpl/bootstrap/ ; \
>+        ls -1 $KOHA_INSTALL_DIR/opac/htdocs/opac-tmpl/prog/ 2> /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
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 12657: 30070 | 30178 | 31686