X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=debian%2Frules;h=b00b9b8a3ad57c5e1583eb6a4c3a89d882d6b4c0;hb=5d6c092921919526ade501facb1220f8a108a08f;hp=7fed07ec7300ccbf3a79685ea4495f0dbc00d898;hpb=5baff558a53fabb7b719bf627064cf2c1680f246;p=koha_fer

diff --git a/debian/rules b/debian/rules
index 7fed07ec73..b00b9b8a3a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ TMP = $(CURDIR)/debian/tmp
 export PERL_MM_USE_DEFAULT=1
 
 %:
-	dh $@ --fail-missing
+	dh $@ --fail-missing --with bash-completion
 
 override_dh_gencontrol:
 	debian/bd-to-depends >> debian/koha-common.substvars
@@ -20,24 +20,21 @@ override_dh_auto_install:
 	rm -r $(TMP)/var/run
 	rm -r $(TMP)/var/lock
 	rm $(TMP)/var/log/koha/README
-#	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
-#	rm $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/lib/jquery/jquery.js
-#	ln -s /usr/share/javascript/jquery/jquery.js \
-#	   $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/lib/jquery/jquery.js
+	rm $(TMP)/etc/koha/searchengine/solr/config.yaml
+	rm $(TMP)/etc/koha/searchengine/solr/indexes.yaml
+	rm $(TMP)/etc/koha/solr/indexes.yaml
 	rm -r \
-		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/js/tinymce
-	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/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/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,12 +47,15 @@ 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/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 \
@@ -88,12 +88,22 @@ 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/*/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/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
+	xt/verify-debian-docbook.t
 	xsltproc --output $(TMP)/debian/tmp_docbook/ \
 	    /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl \
 	    debian/docs/*.xml
+
+override_dh_compress:
+	# exclude history.txt from compression as about.pl needs it uncompressed
+	dh_compress --exclude=history.txt