[med-svn] [roary] 01/02: Merge tag 'debian/3.6.3+dfsg-1' into debian/jessie-backports

[Afif Elghraoui]

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

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

commit 5d5f148d3cac63c4277ff1928e1de0c496e62bcc
Merge: 2edb9c3 84499f4
Author: Afif Elghraoui <afif at debian.org>
Date:   Sat Jul 9 14:34:59 2016 -0700

    Merge tag 'debian/3.6.3+dfsg-1' into debian/jessie-backports
    
    roary Debian release 3.6.3+dfsg-1
    
    Conflicts:
    	debian/control
    
    Conflict was the result of Sascha updating his email address :) and
    me having added myself to uploaders

 debian/changelog                                       |  7 +++++++
 debian/control                                         |  2 +-
 debian/copyright                                       |  2 +-
 debian/patches/add_abstract.patch                      |  2 +-
 debian/patches/fix_log_message.patch                   |  2 +-
 debian/patches/prank_seed.patch                        |  2 +-
 debian/patches/rename_R_script.patch                   |  2 +-
 debian/patches/spelling.patch                          |  2 +-
 debian/tests/test-installed                            |  2 +-
 dist.ini                                               |  2 +-
 lib/Bio/Roary.pm                                       |  2 +-
 lib/Bio/Roary/CommandLine/RoaryPostAnalysis.pm         |  2 +-
 lib/Bio/Roary/External/GeneAlignmentFromNucleotides.pm | 12 ++----------
 lib/Bio/Roary/JobRunner/Parallel.pm                    | 12 +++++++++---
 14 files changed, 29 insertions(+), 24 deletions(-)

diff --cc debian/changelog
index 3a9f1c2,bd7e774..798a86a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ roary (3.6.3+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update uploader email address.
+ 
+  -- Sascha Steinbiss <satta at debian.org>  Fri, 01 Jul 2016 14:42:22 +0000
+ 
 +roary (3.6.2+dfsg-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Afif Elghraoui <afif at debian.org>  Tue, 21 Jun 2016 05:54:52 -0700
 +
  roary (3.6.2+dfsg-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index 4b7f5aa,c943037..3d62f0b
--- a/debian/control
+++ b/debian/control
@@@ -2,8 -2,7 +2,8 @@@ Source: roar
  Section: science
  Priority: extra
  Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
- Uploaders: Sascha Steinbiss <sascha at steinbiss.name>,
 -Uploaders: Sascha Steinbiss <satta at debian.org>
++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,

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