X-Git-Url: http://git.indexdata.com/?p=lui-solr.git;a=blobdiff_plain;f=debian%2Frules;h=eefbd9b8461888265775b73623388d5562da927f;hp=e9e9feca35d72c4987f28c70f26eb7b8d4686572;hb=ea91bc9b7a4cf3358cd8aa04c6581e13d4e4b195;hpb=3335457c4e46665ba60663da0a80d288e3d455d6

diff --git a/debian/rules b/debian/rules
index e9e9fec..eefbd9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,7 +73,7 @@ LUI_SOLR_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT)
 LUI_SOLR4_SLAVE_TOMCAT = $(LUI_SOLR4_SLAVE)-tomcat
 LUI_SOLR4_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT)
 
-SOLR_VERSION=3.6.1
+SOLR_VERSION=3.6.2
 SOLR4_VERSION=4.3.1
 
 PACKAGE=$(shell dh_listpackages)
@@ -103,26 +103,26 @@ install-stamp: build
 
 	# lui-solr-master
 	mkdir -p    $(LUI_SOLR_MASTER_SHARE_DIR)
-	cp -rp conf $(LUI_SOLR_MASTER_SHARE_DIR)
+	cp -rp conf3 $(LUI_SOLR_MASTER_SHARE_DIR)
 	ln -sf solrconfig-master.xml $(LUI_SOLR_MASTER_SHARE_DIR)/conf/solrconfig.xml
 	mkdir -p $(LUI_SOLR_MASTER_LIB_DIR)
 
 	# lui-solr4-master
 	mkdir -p    $(LUI_SOLR4_MASTER_SHARE_DIR)
 	cp -rp conf $(LUI_SOLR4_MASTER_SHARE_DIR)
-	ln -sf solrconfig-master.xml $(LUI_SOLR4_MASTER_SHARE_DIR)/solrconfig.xml
+	ln -sf solrconfig-master.xml $(LUI_SOLR4_MASTER_SHARE_DIR)/conf/solrconfig.xml
 	mkdir -p $(LUI_SOLR4_MASTER_LIB_DIR)
 
 	# lui-solr-slave Slave configuration
 	mkdir -p    $(LUI_SOLR_SLAVE_SHARE_DIR)
-	cp -rp conf $(LUI_SOLR_SLAVE_SHARE_DIR)
+	cp -rp conf3 $(LUI_SOLR_SLAVE_SHARE_DIR)
 	ln -sf solrconfig-slave.xml $(LUI_SOLR_SLAVE_SHARE_DIR)/conf/solrconfig.xml
 	mkdir -p $(LUI_SOLR_SLAVE_LIB_DIR)
 
 	# lui-solr4-slave Slave configuration
 	mkdir -p    $(LUI_SOLR4_SLAVE_SHARE_DIR)
 	cp -rp conf $(LUI_SOLR4_SLAVE_SHARE_DIR)
-	ln -sf solrconfig-slave.xml $(LUI_SOLR4_SLAVE_SHARE_DIR)/solrconfig.xml
+	ln -sf solrconfig4-slave.xml $(LUI_SOLR4_SLAVE_SHARE_DIR)/conf/solrconfig.xml
 	mkdir -p $(LUI_SOLR4_SLAVE_LIB_DIR)
 
 	# lui-solr-master plumbing for Tomcat 6. 
@@ -139,7 +139,7 @@ install-stamp: build
 
 	# lui-solr4-slave plumbing for Tomcat 6
 	mkdir -p $(LUI_SOLR4_SLAVE_ROOT)/etc/masterkey/lui
-	cp etc/solr-tomcat-context-slave.xml $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui/lui-solr4-slave.xml
+	cp etc/solr4-tomcat-context-slave.xml $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui/lui-solr4-slave.xml
 
 	touch $@