[activemq] 06/07: Merge branch 'tmancill/5.6.0+dfsg1-5'

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository activemq.

commit fa1c11ef30e2aef9ab427a8f9a12bee23e179136
Merge: badc6b7 eb1f04c
Author: tony mancill <tmancill at debian.org>
Date:   Mon Oct 26 03:45:35 2015 +0000

    Merge branch 'tmancill/5.6.0+dfsg1-5'

 debian/changelog   | 8 ++++++++
 debian/control     | 7 ++++---
 debian/maven.rules | 2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index 997956b,86bec42..09812ff
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,11 +1,19 @@@
 -activemq (5.6.0+dfsg1-5) unstable; urgency=medium
++activemq (5.6.0+dfsg1-5) UNRELEASED; urgency=medium
+ 
+   * Team upload.
+   * Add missing build-dep on libregexp-java. (Closes: #802858)
+   * Use libcommons-net-java (>= 3).  (Closes: #800764)
+ 
+  -- tony mancill <tmancill at debian.org>  Sun, 25 Oct 2015 11:44:36 -0700
+ 
 +activemq (5.6.0+dfsg1-4+deb8u1) jessie-security; urgency=high
 +
 +  * Team upload.
 +  * Fixed CVE-2014-3576: DoS via unauthenticated remote shutdown command
 +    (Closes: #792857)
 +
 + -- Emmanuel Bourg <ebourg at apache.org>  Mon, 03 Aug 2015 19:17:04 +0200
 +
  activemq (5.6.0+dfsg1-4) unstable; urgency=high
  
    * Team upload.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/activemq.git