Fix post inst. and rm script due to new package names

diff --git a/debian/masterkey-lui-solr-master-tomcat6.postinst b/debian/masterkey-lui-solr-master-tomcat6.postinst
deleted file mode 100644 (file)
index 9b4ba0a..0000000
--- a/debian/masterkey-lui-solr-master-tomcat6.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-ln -sf /etc/masterkey/lui/lui-solr-master.xml /etc/tomcat6/Catalina/localhost/solr.xml
-chown -R tomcat6:tomcat6 /var/lib/masterkey/lui/solr/master

diff --git a/debian/masterkey-lui-solr-master-tomcat6.postrm b/debian/masterkey-lui-solr-master-tomcat6.postrm
deleted file mode 100644 (file)
index 8b3502e..0000000
--- a/debian/masterkey-lui-solr-master-tomcat6.postrm
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-
-case "$1" in
-    purge|remove)
-       rm -f /etc/tomcat6/Catalina/localhost/solr.xml
-#      rm -f /etc/tomcat6/policy.d/05harvester.policy
-        ;;
-    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-        ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-esac
-
-#DEBHELPER#
-
-exit 0

diff --git a/debian/masterkey-lui-solr-slave-tomcat6.postinst b/debian/masterkey-lui-solr-slave-tomcat6.postinst
deleted file mode 100644 (file)
index a647647..0000000
--- a/debian/masterkey-lui-solr-slave-tomcat6.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-ln -sf /etc/masterkey/lui/lui-solr-slave.xml /etc/tomcat6/Catalina/localhost/solr-slave.xml
-chown -R tomcat6:tomcat6 /var/lib/masterkey/lui/solr/slave

diff --git a/debian/masterkey-lui-solr-slave-tomcat6.postrm b/debian/masterkey-lui-solr-slave-tomcat6.postrm
deleted file mode 100644 (file)
index 2c4542a..0000000
--- a/debian/masterkey-lui-solr-slave-tomcat6.postrm
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-
-case "$1" in
-    purge|remove)
-       rm -f /etc/tomcat6/Catalina/localhost/solr-slave.xml
-#      rm -f /etc/tomcat6/policy.d/05harvester.policy
-        ;;
-    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-        ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-esac
-
-#DEBHELPER#
-
-exit 0

diff --git a/debian/masterkey-lui-solr3-master-tomcat6.postinst b/debian/masterkey-lui-solr3-master-tomcat6.postinst
new file mode 100644 (file)
index 0000000..9b4ba0a
--- /dev/null
+++ b/debian/masterkey-lui-solr3-master-tomcat6.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+ln -sf /etc/masterkey/lui/lui-solr-master.xml /etc/tomcat6/Catalina/localhost/solr.xml
+chown -R tomcat6:tomcat6 /var/lib/masterkey/lui/solr/master

diff --git a/debian/masterkey-lui-solr3-master-tomcat6.postrm b/debian/masterkey-lui-solr3-master-tomcat6.postrm
new file mode 100644 (file)
index 0000000..8b3502e
--- /dev/null
+++ b/debian/masterkey-lui-solr3-master-tomcat6.postrm
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+
+case "$1" in
+    purge|remove)
+       rm -f /etc/tomcat6/Catalina/localhost/solr.xml
+#      rm -f /etc/tomcat6/policy.d/05harvester.policy
+        ;;
+    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+esac
+
+#DEBHELPER#
+
+exit 0

diff --git a/debian/masterkey-lui-solr3-slave-tomcat6.postinst b/debian/masterkey-lui-solr3-slave-tomcat6.postinst
new file mode 100644 (file)
index 0000000..a647647
--- /dev/null
+++ b/debian/masterkey-lui-solr3-slave-tomcat6.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+ln -sf /etc/masterkey/lui/lui-solr-slave.xml /etc/tomcat6/Catalina/localhost/solr-slave.xml
+chown -R tomcat6:tomcat6 /var/lib/masterkey/lui/solr/slave

diff --git a/debian/masterkey-lui-solr3-slave-tomcat6.postrm b/debian/masterkey-lui-solr3-slave-tomcat6.postrm
new file mode 100644 (file)
index 0000000..2c4542a
--- /dev/null
+++ b/debian/masterkey-lui-solr3-slave-tomcat6.postrm
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+
+case "$1" in
+    purge|remove)
+       rm -f /etc/tomcat6/Catalina/localhost/solr-slave.xml
+#      rm -f /etc/tomcat6/policy.d/05harvester.policy
+        ;;
+    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+esac
+
+#DEBHELPER#
+
+exit 0

diff --git a/debian/rules b/debian/rules
index 123b4e9..d284cc9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ LUI_SOLR_SLAVE_TOMCAT = $(LUI)-slave-tomcat
 LUI_SOLR_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT)
 #LUI_SOLR_SHARE = $(LUI_SLAVE_TOMCAT_ROOT)/usr/share/masterkey/$(LUI_SLAVE_TOMCAT)
 
 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=3.6.2

 
 PACKAGE=$(shell dh_listpackages)
 
 
 PACKAGE=$(shell dh_listpackages)