From 9f98800b99cc8f1f1818f9ccb2c4db62d2495dc9 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Mon, 17 Sep 2012 15:45:57 -0300 Subject: [PATCH] Bug 8623 - Fix YUI path for OPAC in debian/rules MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 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 Signed-off-by: Paul Poulain --- debian/rules | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 '/^ /s/>.*_DBC_DBUSER_/s/>.*_DBC_DBPASS_