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

diff --git a/IDMETA b/IDMETA
index e7a7247..a9f2738 100644 (file)
--- a/IDMETA
+++ b/IDMETA
@@ -1,4 +1,4 @@
 NAME=masterkey-lui-solr
-VERSION=0.5.0
+VERSION=0.5.2
 DEBIAN_DIST="squeeze wheezy"
 UBUNTU_DIST=""

diff --git a/debian/changelog b/debian/changelog
index 93f27e1..fdee344 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+masterkey-lui-solr (0.5.2-1indexdata) unstable; urgency=low
+
+  * Upstream
+
+ -- Dennis Schafroth <dennis@indexdata.com>  Thu, 05 Sep 2013 10:51:12 +0200
+
+masterkey-lui-solr (0.5.1-1indexdata) unstable; urgency=low
+
+  * Upstream
+
+ -- Dennis Schafroth <dennis@indexdata.com>  Wed, 05 Sep 2013 10:35:52 +0200
+
 masterkey-lui-solr (0.5.0-1indexdata) unstable; urgency=low
 
   * Upstream

diff --git a/debian/rules b/debian/rules
index 4c7d85d..192226b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ DATA_SLAVE  = $(DATA)/slave
 
 LUI_SOLR_COMMON = $(BASE)-common
 LUI_SOLR_COMMON_ROOT = $(CURDIR)/debian/$(LUI_SOLR_COMMON)
-LUI_SOLR_COMMON_DIR = $(LUI_SOLR_COMMON_ROOT)$(SHARE)/war
+LUI_SOLR_COMMON_DIR = $(LUI_SOLR_COMMON_ROOT)$(SHARE)
 
 LUI_SOLR_MASTER = $(BASE)-master
 LUI_SOLR_MASTER_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER)
@@ -63,7 +63,8 @@ install-stamp: build
 
        # lui-solr-common. Install a Solr WAR.
        mkdir -p $(LUI_SOLR_COMMON_DIR)
-       cp dist/solr-$(SOLR_VERSION).war $(LUI_SOLR_COMMON_DIR)
+       mkdir -p $(LUI_SOLR_COMMON_DIR)/war
+       cp dist/solr-$(SOLR_VERSION).war $(LUI_SOLR_COMMON_DIR)/war/
        cp -rp scripts $(LUI_SOLR_COMMON_DIR)
 
        # lui-solr-master

diff --git a/etc/solr4-tomcat-context-master.xml b/etc/solr4-tomcat-context-master.xml
index c2b52f3..efe586d 100644 (file)
--- a/etc/solr4-tomcat-context-master.xml
+++ b/etc/solr4-tomcat-context-master.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Version 0.5.2. Adding comment to force config update  -->
 <Context 
     docBase="/usr/share/masterkey/lui/solr4/war/solr-4.4.0.war" 
     path="/solr4"

diff --git a/etc/solr4-tomcat-context-slave.xml b/etc/solr4-tomcat-context-slave.xml
index de2b171..01c1bd3 100644 (file)
--- a/etc/solr4-tomcat-context-slave.xml
+++ b/etc/solr4-tomcat-context-slave.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Version 0.5.2. Adding comment to force check -->
 <Context 
     docBase="/usr/share/masterkey/lui/solr4/war/solr-4.4.0.war" 
     path="/solr4-slave"