[med-svn] [artemis] 01/02: Merge branch 'master' into debian/jessie-backports

[Afif Elghraoui]

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

afif-guest pushed a commit to branch debian/jessie-backports
in repository artemis.

commit 22fa6390899ea8be5b37c03c5d07a98609f83641
Merge: 14f2ba8 8220526
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Sun Nov 22 20:36:27 2015 -0800

    Merge branch 'master' into debian/jessie-backports
    
    Update backport.

 debian/changelog | 7 +++++++
 debian/control   | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 79199f2,6a7a457..31c63bc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,17 @@@
+ artemis (16.0.0+dfsg-4) unstable; urgency=high
+ 
+   * Add dependency on libbiojava-java, a package required for
+     Artemis to function.
+ 
+  -- Afif Elghraoui <afif at ghraoui.name>  Fri, 20 Nov 2015 21:15:22 -0800
+ 
 +artemis (16.0.0+dfsg-3~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Revert "Depend on libcommons-net-java instead of libcommons-net2-java"
 +
 + -- Afif Elghraoui <afif at ghraoui.name>  Fri, 13 Nov 2015 22:44:21 -0800
 +
  artemis (16.0.0+dfsg-3) unstable; urgency=medium
  
    [ Afif Elghraoui ]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/artemis.git