From: Tomas Cohen Arazi <tomascohen@gmail.com>
Date: Mon, 17 Sep 2012 18:45:57 +0000 (-0300)
Subject: Bug 8623 - Fix YUI path for OPAC in debian/rules
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=9f98800b99cc8f1f1818f9ccb2c4db62d2495dc9;hp=51078703591fbce3dae36f39943eb2320925fd05;p=koha.git

Bug 8623 - Fix YUI path for OPAC in debian/rules

After the changes to YUI path the build process is broken. For testing this I had
to set the build process to ommit the tests as there are some db_dependent test being
called (which failed).

To do this I ran the build script like this:

sudo DEB_BUILD_OPTIONS=nocheck ./debian/build-git-snapshot -distribution precise -D precise -r ~/ubuntu -v 3.9.0-046~git -d

Note: Even when this is fixed, there are still issues with some files missing

dh_install: etc/koha/searchengine/solr/config.yaml exists in debian/tmp but is not installed to anywhere
dh_install: etc/koha/searchengine/solr/indexes.yaml exists in debian/tmp but is not installed to anywhere
dh_install: etc/koha/solr/indexes.yaml exists in debian/tmp but is not installed to anywhere
dh_install: missing files, aborting
make: *** [binary] Error 2
dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2

Sponsored-by: Universidad Nacional de Córdoba

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Please note that debian/rules *must* use tabs. If you have a git hook
that automatically replaces tabs with spaces, please undo those changes.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
---

diff --git a/debian/rules b/debian/rules
index 7fed07ec73..9a759e3e2e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,9 +35,9 @@ override_dh_auto_install:
 	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/prog/en/lib/yui
+              $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/lib/yui
 	ln -s /usr/share/javascript/yui \
-		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/lib/yui
+         $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/lib/yui
 	install -d $(TMP)/etc/apache2/sites-available
 	install -d $(TMP)/etc/apache2/sites-enabled
 	install -d $(TMP)/etc/apache2/conf.d
@@ -50,11 +50,11 @@ 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/prog/en/lib/yui/skin.css \
-		koha-tmpl/opac-tmpl/prog/en/lib/yui/reset-fonts-grids.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/intranet/htdocs/intranet-tmpl/prog/en/css
-	install -m 0644 koha-tmpl/opac-tmpl/prog/en/lib/yui/skin.css \
-		koha-tmpl/opac-tmpl/prog/en/lib/yui/reset-fonts-grids.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/intranet-tmpl/prog/en/lib/yui/menu-button-arrow-disabled.png \
 		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css