X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=debian%2Frules;h=0b75d090b8f5e6fb15511a6fd5b68e5ad2e6e425;hb=be691769829d236375eaabe51fadf6f366dd3f6b;hp=7fed07ec7300ccbf3a79685ea4495f0dbc00d898;hpb=6eb021ab0e113e2b6b897c89475f1eadc7a2c15b;p=koha.git

diff --git a/debian/rules b/debian/rules
index 7fed07ec73..0b75d090b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,9 @@ override_dh_auto_install:
 	rm -r $(TMP)/var/run
 	rm -r $(TMP)/var/lock
 	rm $(TMP)/var/log/koha/README
+	rm $(TMP)/etc/koha/searchengine/solr/config.yaml
+	rm $(TMP)/etc/koha/searchengine/solr/indexes.yaml
+	rm $(TMP)/etc/koha/solr/indexes.yaml
 #	rm $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/lib/jquery/jquery.js
 #	ln -s /usr/share/javascript/jquery/jquery.js \
 #	   $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/lib/jquery/jquery.js
@@ -28,16 +31,17 @@ override_dh_auto_install:
 #	   $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/lib/jquery/jquery.js
 	rm -r \
 		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/js/tinymce
+		mkdir -p $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/js/tinymce/jscripts
 	ln -s /usr/share/tinymce2/www \
-		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/js/tinymce
+              $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/js/tinymce/jscripts/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/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 +54,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
@@ -88,10 +92,12 @@ override_dh_auto_install:
 		$(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/prog/en/css/opac.css \
+		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css/sco.css
 	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/opac/htdocs/opac-tmpl/prog/en/css/opac.css \
-		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css/sco.css \
 		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css/staff-global*.css
 	mkdir -p $(TMP)/debian/tmp_docbook
 	xsltproc --output $(TMP)/debian/tmp_docbook/ \