X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=debian%2Frules;h=20eb9e207f42d8a61d36861c6f3a2994a330e626;hb=b4580bff5ba7753f9db2513c3b87ecb9bba5258c;hp=971d46cd33adc2420b5593ff997d0831dd27d776;hpb=f7644ec91f2d151535f8f5125c4057a9213d766e;p=koha.git

diff --git a/debian/rules b/debian/rules
index 971d46cd33..20eb9e207f 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
@@ -16,31 +16,15 @@ override_dh_auto_install:
 	dh_auto_install
 	rm $(TMP)/etc/koha/README.txt
 	rm $(TMP)/etc/koha/SIPconfig.xml
+	rm $(TMP)/etc/koha/log4perl.conf
 	rm -r $(TMP)/usr/share/koha/doc
 	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
-#	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 -r \
 		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/lib/tiny_mce
-	ln -s /usr/share/tinymce2/www \
+	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
 	install -d $(TMP)/etc/apache2/sites-available
 	install -d $(TMP)/etc/apache2/sites-enabled
 	install -d $(TMP)/etc/apache2/conf.d
@@ -53,53 +37,12 @@ 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/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/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/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