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

[Sascha Steinbiss]

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

satta pushed a commit to branch debian/jessie-backports
in repository roary.

commit 48c1fac64fdca59926bfd8093f22374d50de1ddb
Merge: 5bf40db 16288ee
Author: Sascha Steinbiss <satta at debian.org>
Date:   Fri Jun 30 12:47:31 2017 +0200

    Merge branch 'master' into debian/jessie-backports

 AUTHORS                                     |  2 +-
 Dockerfile                                  |  7 +----
 README.md                                   | 43 +++++++++++++++++++----------
 debian/changelog                            | 28 +++++++++++++++++++
 debian/compat                               |  2 +-
 debian/control                              |  2 +-
 debian/copyright                            |  2 +-
 debian/patches/series                       |  1 -
 debian/patches/spelling                     | 17 ------------
 debian/watch                                |  2 +-
 dist.ini                                    |  2 +-
 lib/Bio/Roary.pm                            |  2 ++
 lib/Bio/Roary/AnnotateGroups.pm             |  4 +--
 lib/Bio/Roary/CommandLine/IterativeCdhit.pm |  6 ++--
 lib/Bio/Roary/CommandLine/Roary.pm          | 10 +++++--
 lib/Bio/Roary/External/Makeblastdb.pm       |  1 -
 lib/Bio/Roary/External/Mcl.pm               |  4 +--
 t/Bio/Roary/External/Makeblastdb.t          |  2 +-
 t/bin/dummy_makeblastdb                     |  1 -
 t/bin/dummy_segmasker                       |  1 -
 20 files changed, 82 insertions(+), 57 deletions(-)

diff --cc debian/changelog
index 4a88bf5,5072206..2f699d1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,31 +1,37 @@@
+ roary (3.8.2+dfsg-2) unstable; urgency=medium
+ 
+   * Upload to unstable.
+ 
+  -- Sascha Steinbiss <satta at debian.org>  Sun, 18 Jun 2017 12:00:16 +0000
+ 
+ roary (3.8.2+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Sascha Steinbiss <satta at debian.org>  Mon, 29 May 2017 16:38:49 +0200
+ 
+ roary (3.8.0+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Sascha Steinbiss <satta at debian.org>  Wed, 25 Jan 2017 16:43:20 +0100
+ 
+ roary (3.7.1+dfsg-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream version
+   * d/watch: version=4
+   * debhelper 10
+   * Priority: optional
+ 
+  -- Andreas Tille <tille at debian.org>  Thu, 19 Jan 2017 08:37:01 +0100
+ 
 +roary (3.7.0+dfsg-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Afif Elghraoui <afif at debian.org>  Sun, 16 Oct 2016 13:16:38 -0700
 +
  roary (3.7.0+dfsg-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index 3d62f0b,6c974d8..fd972d1
--- a/debian/control
+++ b/debian/control
@@@ -1,10 -1,9 +1,10 @@@
  Source: roary
  Section: science
- Priority: extra
+ Priority: optional
  Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 -Uploaders: Sascha Steinbiss <satta at debian.org>
 -Build-Depends: debhelper (>= 10),
 +Uploaders: Sascha Steinbiss <satta at debian.org>,
 +	   Afif Elghraoui <afif at debian.org>
 +Build-Depends: debhelper (>= 9),
                 dh-dist-zilla,
                 libdist-zilla-plugin-podweaver-perl,
                 bioperl,

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