This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository activemq.
commit b076eea40ec6ee15578dbd10c86d8efdd79f619b Author: Markus Koschany <[email protected]> Date: Sat Mar 19 14:17:03 2016 +0100 Update init-debian-default-values.patch --- debian/patches/init-debian-default-values.patch | 28 ++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/debian/patches/init-debian-default-values.patch b/debian/patches/init-debian-default-values.patch index 0498c51..1f1bf98 100644 --- a/debian/patches/init-debian-default-values.patch +++ b/debian/patches/init-debian-default-values.patch @@ -3,11 +3,11 @@ Date: Tue, 15 Mar 2016 19:43:05 +0100 Subject: init debian default values --- - assembly/src/release/bin/activemq | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) + assembly/src/release/bin/activemq | 23 +++++++++++------------ + 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq -index 261493b..91f1e3e 100755 +index 261493b..1079c0b 100755 --- a/assembly/src/release/bin/activemq +++ b/assembly/src/release/bin/activemq @@ -101,12 +101,12 @@ getActiveMQHome(){ @@ -43,3 +43,25 @@ index 261493b..91f1e3e 100755 fi +@@ -167,14 +167,13 @@ fi + # LOAD CONFIGURATION + + # CONFIGURATION +-# For using instances +-if ( basename $0 | grep "activemq-instance-" > /dev/null);then +- INST="`basename $0|sed 's/^activemq-instance-//;s/\.sh$//'`" +- ACTIVEMQ_CONFIGS="/etc/default/activemq-instance-${INST} $HOME/.activemqrc-instance-${INST}" +- echo "INFO: Using alternative activemq configuration files: $ACTIVEMQ_CONFIGS" +-else +- ACTIVEMQ_CONFIGS="/etc/default/activemq $HOME/.activemqrc $ACTIVEMQ_HOME/bin/env" +-fi ++ ++ACTIVEMQ_CONFIGS="/usr/share/activemq/activemq-options" ++ ++if [ -r "/etc/activemq/instances-enabled/$INSTANCE/options" ]; then ++ ACTIVEMQ_CONFIGS="/etc/activemq/instances-enabled/$INSTANCE/options" ++ fi ++ + + # load activemq configuration + CONFIG_LOAD="no" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/activemq.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
