[med-svn] [mauve-aligner] 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 mauve-aligner.

commit 7f61c93346abbc45618e95ba65898024e946cef6
Merge: 043352e aa7057d
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Mon Nov 23 20:44:28 2015 -0800

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

 debian/changelog             | 15 +++++++++++++++
 debian/control               |  9 +++++++--
 debian/install               |  2 ++
 debian/mauve-aligner.desktop | 13 +++++++++++++
 debian/rules                 |  2 ++
 5 files changed, 39 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 7ddb2f9,ac0ca6c..3a1ef9e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,18 +1,24 @@@
+ mauve-aligner (2.4.0+4734-3) unstable; urgency=high
+ 
+   * Add explicit dependency on libbiojava-java to enable
+     functionality of the GUI
+   * Create a desktop menu to launch the GUI
+ 
+  -- Afif Elghraoui <afif at ghraoui.name>  Sat, 21 Nov 2015 00:30:04 -0800
+ 
+ mauve-aligner (2.4.0+4734-2) unstable; urgency=medium
+ 
+   * Add missing dependency: java-wrappers
+     Closes: #796029
+ 
+  -- Andreas Tille <tille at debian.org>  Wed, 19 Aug 2015 07:06:53 +0200
+ 
 +mauve-aligner (2.4.0+4734-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Backport to Jessie
 +
 + -- Andreas Tille <tille at debian.org>  Thu, 23 Jul 2015 19:05:23 +0200
 +
  mauve-aligner (2.4.0+4734-1) unstable; urgency=medium
  
    * Initial release (Closes: #787209)

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