X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=debian%2Frules;h=ac84e1421971ca7a93ab0025413853f48b5f1504;hb=72cf76f29516f9c8fac1a95cecc0aa42aa5e9ed6;hp=cb2eee31ea660d26da3039cd745033b53224fb0d;hpb=8a53d284907bbbe9d3ee2552e964af9f5dfbd0ac;p=koha-ffzg.git

diff --git a/debian/rules b/debian/rules
index cb2eee31ea..ac84e14219 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,42 +6,25 @@ 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
+	debian/bd-to-depends >> debian/koha-core.substvars
 	dh_gencontrol
 
 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 $(TMP)/etc/koha/apache.conf
+	rm $(TMP)/etc/koha/nginx.conf
+	rm $(TMP)/etc/koha/koha-worker.service
 	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/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/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/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
@@ -54,50 +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(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 --exclude=contributors.yaml --exclude=teams.yaml