Merge with master

diff --git a/debian/changelog b/debian/changelog
index e24e19f..b1ef286 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,12 @@ masterkey-lui-solr4 (0.4.1-1indexdata) unstable; urgency=low
 
  -- 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 --git a/debian/rules b/debian/rules
index eaccc05..e9e9fec 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -104,7 +104,7 @@ 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-solr4-master
@@ -116,7 +116,7 @@ install-stamp: build
        # 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