From d6eaf13d24b6c71c930c8f2cd81eb67cd6d87187 Mon Sep 17 00:00:00 2001 From: Dennis Schafroth Date: Tue, 20 Aug 2013 14:32:14 +0200 Subject: [PATCH] Fix post inst. and rm script due to new package names --- debian/masterkey-lui-solr-master-tomcat6.postinst | 3 --- debian/masterkey-lui-solr-master-tomcat6.postrm | 18 ------------------ debian/masterkey-lui-solr-slave-tomcat6.postinst | 3 --- debian/masterkey-lui-solr-slave-tomcat6.postrm | 18 ------------------ debian/masterkey-lui-solr3-master-tomcat6.postinst | 3 +++ debian/masterkey-lui-solr3-master-tomcat6.postrm | 18 ++++++++++++++++++ debian/masterkey-lui-solr3-slave-tomcat6.postinst | 3 +++ debian/masterkey-lui-solr3-slave-tomcat6.postrm | 18 ++++++++++++++++++ debian/rules | 2 +- 9 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 debian/masterkey-lui-solr-master-tomcat6.postinst delete mode 100644 debian/masterkey-lui-solr-master-tomcat6.postrm delete mode 100644 debian/masterkey-lui-solr-slave-tomcat6.postinst delete mode 100644 debian/masterkey-lui-solr-slave-tomcat6.postrm create mode 100644 debian/masterkey-lui-solr3-master-tomcat6.postinst create mode 100644 debian/masterkey-lui-solr3-master-tomcat6.postrm create mode 100644 debian/masterkey-lui-solr3-slave-tomcat6.postinst create mode 100644 debian/masterkey-lui-solr3-slave-tomcat6.postrm diff --git a/debian/masterkey-lui-solr-master-tomcat6.postinst b/debian/masterkey-lui-solr-master-tomcat6.postinst deleted file mode 100644 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 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 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 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 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 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 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 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 --- 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) -SOLR_VERSION=3.6.1 +SOLR_VERSION=3.6.2 PACKAGE=$(shell dh_listpackages) -- 1.7.10.4