From: Dennis Schafroth <dennis@indexdata.com>
Date: Tue, 2 Jul 2013 14:39:11 +0000 (+0200)
Subject: Merge with master
X-Git-Tag: v0.4.4~11
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=3335457c4e46665ba60663da0a80d288e3d455d6;p=lui-solr.git

Merge with master
---

3335457c4e46665ba60663da0a80d288e3d455d6
diff --cc debian/changelog
index 79dcc9e,e24e19f..b1ef286
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
+ masterkey-lui-solr (0.4.2-1indexdata) unstable; urgency=low
+ 
+   * Upstream
+ 
+  -- Dennis Schafroth <dennis@indexdata.com>  Fri, 28 Jun 2013 15:35:30 +0200
+ 
+ masterkey-lui-solr4 (0.4.1-1indexdata) unstable; urgency=low
+ 
+   * Upstream
+ 
+  -- Dennis Schafroth <dennis@indexdata.com>  Fri, 28 Jun 2013 13:21:51 +0200
+ 
 +masterkey-lui-solr (0.3.1-4indexdata) unstable; urgency=low
 +
 +  * Upstream
 +
 + -- dennis <dennis@indexdata.com>  Tue, 29 Jan 2013 21:00:38 +0100
 +
  masterkey-lui-solr (0.3.1-3indexdata) unstable; urgency=low
  
    * Upstream
diff --cc debian/rules
index bdd61c0,eaccc05..e9e9fec
--- a/debian/rules
+++ b/debian/rules
@@@ -64,15 -104,27 +104,27 @@@ 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-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
+ 	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)
 -	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-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
+ 	mkdir -p $(LUI_SOLR4_SLAVE_LIB_DIR)
+ 
  	# lui-solr-master plumbing for Tomcat 6. 
  	mkdir -p $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui
  	cp etc/solr-tomcat-context-master.xml $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui/lui-solr-master.xml