[SCM] Debian packaging for activemq branch, master, updated. debian/5.5.0+dfsg-5-2-geb2851d

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit bc9694c49e97535d1aa3a23a232e245cdf6baa86
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Sun Apr 1 20:25:54 2012 +0200

    d/patches/activemq-admin.patch: Fix activemq-admin "unexpected operator" (Closes: #662698). Thanks to Mathieu Mitchell.

diff --git a/debian/changelog b/debian/changelog
index 39e67ad..870b799 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+activemq (5.5.0+dfsg-6) unstable; urgency=low
+
+  * d/patches/activemq-admin.patch: Fix activemq-admin "unexpected operator"
+    (Closes: #662698). Thanks to Mathieu Mitchell.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 01 Apr 2012 20:25:04 +0200
+
 activemq (5.5.0+dfsg-5) unstable; urgency=high
 
   * Fix CVE-2011-4905 (potential Denial of Service) by backporting upstream
diff --git a/debian/patches/activemq-admin.patch b/debian/patches/activemq-admin.patch
new file mode 100644
index 0000000..d15b2d6
--- /dev/null
+++ b/debian/patches/activemq-admin.patch
@@ -0,0 +1,17 @@
+Description: Fix running activemq-admin without any argument
+ which led to "132: [: =: unexpected operator".
+Author: Mathieu Mitchell <mat128 at gmail.com>
+Last-Update: 2012-03-05
+Forwarded: no
+
+--- a/assembly/src/release/bin/activemq-admin
++++ b/assembly/src/release/bin/activemq-admin
+@@ -129,7 +129,7 @@
+ # Set default classpath
+ ACTIVEMQ_CLASSPATH="${ACTIVEMQ_BASE}/conf;"$ACTIVEMQ_CLASSPATH
+ 
+-if [ $1 = "start" ] ; then
++if [ "$1" = "start" ] ; then
+     if [ -z "$ACTIVEMQ_OPTS" ] ; then
+         ACTIVEMQ_OPTS="-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=logging.properties"
+     fi
diff --git a/debian/patches/series b/debian/patches/series
index 7b60e01..c777eee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ exclude_spring_osgi.diff
 javadoc_links.diff
 init_debian_default_values.diff
 CVE-2011-4605.diff
+activemq-admin.patch

-- 
Debian packaging for activemq