X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=debian%2Frules;h=2a9b4acc26657ed35928779299c395cc118d5660;hb=8e13f2b439f47b645f4395e979210f5fb4d935c6;hp=802373f8cce15fca16a0fcf9b69ee87e07fcdca6;hpb=0811dbaf9371212607c714213e15507a3af91985;p=pazpar2-moved-to-github.git

diff --git a/debian/rules b/debian/rules
index 802373f..2a9b4ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,10 +78,11 @@ binary-arch: build install
 	# pazpar2-doc package
 	mv $(CURDIR)/debian/pazpar2/usr/share/doc/pazpar2/* $(CURDIR)/debian/pazpar2-doc/usr/share/doc/pazpar2-doc
 	# 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/*.xsl $(CURDIR)/debian/pazpar2/etc/pazpar2/
+	cp $(CURDIR)/debian/server.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/server.xml
+	cp $(CURDIR)/etc/default.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/services-available/
+	cp $(CURDIR)/etc/services/*.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/services-available
+	cp $(CURDIR)/etc/settings/*.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/settings/
+	cp $(CURDIR)/etc/*.xsl $(CURDIR)/debian/pazpar2/etc/pazpar2/
 	# pazpar2-apache2 package
 	cp $(CURDIR)/debian/ap2pazpar2.cfg $(CURDIR)/debian/pazpar2-apache2/etc/pazpar2
 	# pazpar2-test1 package
@@ -90,7 +91,7 @@ binary-arch: build install
 	# 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/
+	cp www/jsdemo/*.png $(CURDIR)/debian/pazpar2-jsdemo/usr/share/pazpar2/jsdemo/
 	cp www/jsdemo/*.css $(CURDIR)/debian/pazpar2-jsdemo/usr/share/pazpar2/jsdemo/
 	# pazpar2-js package
 	cp $(CURDIR)/debian/ap2pazpar2-js.cfg $(CURDIR)/debian/pazpar2-js/etc/pazpar2