Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr

diff --combined debian/rules
index bdd61c0,f690f86..afebfea
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -38,7 -38,7 +38,7 @@@ LUI_SOLR_SLAVE_TOMCAT = $(LUI)-slave-to
  LUI_SOLR_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT)
  #LUI_SOLR_SHARE = $(LUI_SLAVE_TOMCAT_ROOT)/usr/share/masterkey/$(LUI_SLAVE_TOMCAT)
  
- SOLR_VERSION=3.6.1
+ SOLR_VERSION=4.3.1
  
  PACKAGE=$(shell dh_listpackages)
  
@@@ -64,13 -64,13 +64,13 @@@ install-stamp: buil
        # lui-solr-master
        mkdir -p    $(LUI_SOLR_MASTER_SHARE_DIR)
        cp -rp conf $(LUI_SOLR_MASTER_SHARE_DIR)
 -      ln -sf solrconfig-master.xml $(LUI_SOLR_MASTER_SHARE_DIR)/solrconfig.xml
 +      ln -sf solrconfig-master.xml $(LUI_SOLR_MASTER_SHARE_DIR)/conf/solrconfig.xml
        mkdir -p $(LUI_SOLR_MASTER_LIB_DIR)
  
        # lui-solr-slave Slave configuration
        mkdir -p    $(LUI_SOLR_SLAVE_SHARE_DIR)
        cp -rp conf $(LUI_SOLR_SLAVE_SHARE_DIR)
 -      ln -sf solrconfig-slave.xml $(LUI_SOLR_SLAVE_SHARE_DIR)/solrconfig.xml
 +      ln -sf solrconfig-slave.xml $(LUI_SOLR_SLAVE_SHARE_DIR)/conf/solrconfig.xml
        mkdir -p $(LUI_SOLR_SLAVE_LIB_DIR)
  
        # lui-solr-master plumbing for Tomcat 6.