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

diff --git a/debian/rules b/debian/rules
index fc53d59..32fb674 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,18 +77,21 @@ 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/
 	# 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 www/jsdemo/*.gif $(CURDIR)/debian/pazpar2-jsdemo/usr/share/pazpar2/jsdemo/
 	dh_installchangelogs NEWS
 	dh_installdocs
 	dh_installexamples