X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=debian%2Frules;h=e7af44760777907f9f2cc4313b17255e4ced02f1;hb=be4fd5e3f75c2af7331375a5366fa4b38238235c;hp=1068b5ae85f79c1f63b1d2ddafd06a4fc2b6901c;hpb=e709c597b12450d07d225419f6d08e8d3d295820;p=pazpar2-moved-to-github.git

diff --git a/debian/rules b/debian/rules
index 1068b5a..e7af447 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,24 +77,34 @@ 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/
-	cp etc/*.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/settings/
+	# pazpar2 package
+	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 etc/settings/*.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/*.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
+	mv $(CURDIR)/debian/pazpar2/usr/share/pazpar2/js/pz2.js $(CURDIR)/debian/pazpar2-js/usr/share/pazpar2/js/
+
+	# rest
+
 	dh_installchangelogs NEWS
 	dh_installdocs
 	dh_installexamples
 #	dh_install
 #	dh_installmenu
 #	dh_installdebconf	
-#	dh_installlogrotate
+	dh_installlogrotate
 #	dh_installemacsen
 #	dh_installpam
 #	dh_installmime