From: Dennis Schafroth <dennis@indexdata.com>
Date: Thu, 25 Apr 2013 12:06:20 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr
X-Git-Tag: v0.4.4~12
X-Git-Url: http://git.indexdata.com/?p=lui-solr.git;a=commitdiff_plain;h=dbbba85055915647a2b84ca3b6a2347edebb445f;hp=4771569b1f412673ce1aa9b020cc9132f199fd3b

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

diff --git a/debian/changelog b/debian/changelog
index d3a290b..79dcc9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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 --git a/debian/rules b/debian/rules
index a46f443..bdd61c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,13 +64,13 @@ install-stamp: build
 	# 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.