[med-svn] [roary] 01/02: Merge tag 'debian/3.6.1+dfsg-2' 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 c7ceb51607dc20e3209bf0195fff5dec5abf50c2
Merge: 11e5c94 98c4d9f
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Sun May 8 01:56:55 2016 -0700

    Merge tag 'debian/3.6.1+dfsg-2' into debian/jessie-backports
    
    roary Debian release 3.6.1+dfsg-2
    
    Conflicts:
    	debian/rules

 .gitignore                               |  1 -
 bin/roary-create_pan_genome_plots.R      | 59 ++++++++++++++++++++++++++++++
 bin/roary-pan_genome_reorder_spreadsheet | 19 ++++++++++
 bin/roary-query_pan_genome               | 19 ++++++++++
 debian/changelog                         | 27 ++++++++++++++
 debian/control                           |  2 +-
 debian/patches/fix_log_message.patch     | 22 +++++++++++
 debian/patches/prank_seed.patch          | 63 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 debian/rules                             |  5 ++-
 dist.ini                                 |  2 +-
 11 files changed, 215 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 55d9fd7,7f39541..755c693
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,30 +1,37 @@@
+ roary (3.6.1+dfsg-2) unstable; urgency=medium
+ 
+   * Use correct argument format for easy_init to get rid of warning message.
+   * Bump Standards-Version.
+ 
+  -- Sascha Steinbiss <sascha at steinbiss.name>  Sat, 30 Apr 2016 10:52:10 +0000
+ 
+ roary (3.6.1+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Sascha Steinbiss <sascha at steinbiss.name>  Wed, 20 Apr 2016 09:24:16 +0000
+ 
+ roary (3.6.0+dfsg-4) unstable; urgency=medium
+ 
+   * Remove patch for PRANK.
+   * Disable tests due to nondeterminism until upstream has fixed the issue.
+ 
+  -- Sascha Steinbiss <sascha at steinbiss.name>  Wed, 06 Apr 2016 23:31:55 +0000
+ 
+ roary (3.6.0+dfsg-3) unstable; urgency=medium
+ 
+   * Attempt to fix FTBFS in reproducibility tests by choosing a
+     fixed random seed for PRANK.
+ 
+  -- Sascha Steinbiss <sascha at steinbiss.name>  Mon, 04 Apr 2016 17:02:10 +0000
+ 
 +roary (3.6.0+dfsg-2~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Add a workaround for #808552 to allow building on jessie
 +  * Rebuild for jessie-backports.
 +
 + -- Afif Elghraoui <afif at debian.org>  Sun, 20 Mar 2016 00:55:31 -0700
 +
  roary (3.6.0+dfsg-2) unstable; urgency=medium
  
    * Add autopkgtest.
diff --cc debian/rules
index 670d44b,9e2f3b3..96bec97
--- a/debian/rules
+++ b/debian/rules
@@@ -1,10 -1,5 +1,8 @@@
  #!/usr/bin/make -f
  
- # DH_VERBOSE := 1
- 
 +# work around #808552, which still affects Debian 8
 +export DZIL_GLOBAL_CONFIG_ROOT=/sbuild-nonexistent
 +
  %:
  	dh $@ --with dist-zilla
  

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