X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=debian%2Frules;h=32fb674a70b5e58aa0ea9a634b7671c3c0ff1dcf;hb=e49fcad942efc9104af9837fa04d94188058e85a;hp=afc57d3e64ab22449ae497fc18ab1895360b1856;hpb=e648fad9feddf0b92031567eaeba9222959928ce;p=pazpar2-moved-to-github.git

diff --git a/debian/rules b/debian/rules
index afc57d3..32fb674 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,26 +77,28 @@ binary-arch: build install
 	dh_installchangelogs NEWS
 	# pazpar2-doc package
 	mv $(CURDIR)/debian/pazpar2/usr/share/doc/pazpar2/* $(CURDIR)/debian/pazpar2-doc/usr/share/doc/pazpar2-doc
-	# pazpar2-apache2 package
-	cp $(CURDIR)/debian/pazpar2.cfg $(CURDIR)/debian/pazpar2/etc/pazpar2/
+	# pazpar2 package
+	cp $(CURDIR)/etc/pazpar2.cfg.dist $(CURDIR)/debian/pazpar2/etc/pazpar2/pazpar2.cfg
+	patch $(CURDIR)/debian/pazpar2/etc/pazpar2/pazpar2.cfg $(CURDIR)/debian/cfg.patch
+	cp etc/settings/*.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/settings/
 	cp etc/*.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/settings/
 	cp etc/*.xsl $(CURDIR)/debian/pazpar2/etc/pazpar2/
-	cp $(CURDIR)/debian/ap2pazpar2.cfg $(CURDIR)/debian/pazpar2-apache2/etc/apache2/conf.d
+	# pazpar2-apache2 package
+	cp $(CURDIR)/debian/ap2pazpar2.cfg $(CURDIR)/debian/pazpar2-apache2/etc/pazpar2
 	# pazpar2-test1 package
-	cp www/test1/index.html $(CURDIR)/debian/pazpar2-test1/usr/share/pazpar2-test1/
-	cp www/test1/search.js $(CURDIR)/debian/pazpar2-test1/usr/share/pazpar2-test1/
-	cp $(CURDIR)/debian/ap2test1.cfg $(CURDIR)/debian/pazpar2-test1/etc/apache2/conf.d
+	cp www/test1/index.html $(CURDIR)/debian/pazpar2-test1/usr/share/pazpar2/test1/
+	cp www/test1/search.js $(CURDIR)/debian/pazpar2-test1/usr/share/pazpar2/test1/
 	# pazpar2-jsdemo package
-	cp www/jsdemo/*.html $(CURDIR)/debian/pazpar2-jsdemo/usr/share/pazpar2-jsdemo/
-	cp www/jsdemo/*.js $(CURDIR)/debian/pazpar2-jsdemo/usr/share/pazpar2-jsdemo/
-	cp $(CURDIR)/debian/ap2jsdemo.cfg $(CURDIR)/debian/pazpar2-jsdemo/etc/apache2/conf.d
+	cp www/jsdemo/*.html $(CURDIR)/debian/pazpar2-jsdemo/usr/share/pazpar2/jsdemo/
+	cp www/jsdemo/*.js $(CURDIR)/debian/pazpar2-jsdemo/usr/share/pazpar2/jsdemo/
+	cp www/jsdemo/*.gif $(CURDIR)/debian/pazpar2-jsdemo/usr/share/pazpar2/jsdemo/
 	dh_installchangelogs NEWS
 	dh_installdocs
 	dh_installexamples
 #	dh_install
 #	dh_installmenu
 #	dh_installdebconf	
-#	dh_installlogrotate
+	dh_installlogrotate
 #	dh_installemacsen
 #	dh_installpam
 #	dh_installmime