[med-svn] [r-bioc-phyloseq] 05/11: Fix versioned dependency from ade4

[Andreas Tille]

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

tille pushed a commit to branch master
in repository r-bioc-phyloseq.

commit 5a29a5f71740ebb710f823626b09496563f453c9
Author: Andreas Tille <tille at debian.org>
Date:   Thu Nov 17 16:40:27 2016 +0000

    Fix versioned dependency from ade4
---
 debian/changelog                      |  5 ++---
 debian/patches/fix_ade4_version.patch | 17 +++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b84268..76424ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,11 @@
-r-bioc-phyloseq (1.18.0-1) UNRELEASED; urgency=medium
+r-bioc-phyloseq (1.18.0-1) unstable; urgency=medium
 
-  TODO: Sort out not fullfilled ade4 (>= 1.7.2) (ade has version 1.7-4)
   * New upstream version
   * Convert to dh-r
   * Generic BioConductor homepage
   * d/watch: version=4
 
- -- Andreas Tille <tille at debian.org>  Fri, 11 Nov 2016 10:41:03 +0100
+ -- Andreas Tille <tille at debian.org>  Thu, 17 Nov 2016 16:36:02 +0100
 
 r-bioc-phyloseq (1.16.2-1) unstable; urgency=low
 
diff --git a/debian/patches/fix_ade4_version.patch b/debian/patches/fix_ade4_version.patch
new file mode 100644
index 0000000..bca9eff
--- /dev/null
+++ b/debian/patches/fix_ade4_version.patch
@@ -0,0 +1,17 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Thu, 17 Nov 2016 16:36:02 +0100
+Description: Upstream is refering to a not existing version number
+ which is accepted by R but creates a conflict in the Debian packaging
+ system since dh-r creates versioned dependencies automatically
+
+--- a/DESCRIPTION
++++ b/DESCRIPTION
+@@ -10,7 +10,7 @@ Author: Paul J. McMurdie <mcmurdie at stanf
+     Susan Holmes <susan at stat.stanford.edu>, with
+     contributions from Gregory Jordan and Scott Chamberlain
+ License: AGPL-3
+-Imports: BiocGenerics (>= 0.14.0), ade4 (>= 1.7.2), ape (>= 3.1.1),
++Imports: BiocGenerics (>= 0.14.0), ade4 (>= 1.7-2), ape (>= 3.1.1),
+         biomformat (>= 0.4.0), Biostrings (>= 2.28.0), cluster (>=
+         1.14.4), data.table (>= 1.9.6), foreach (>= 1.4.2), ggplot2 (>=
+         2.1.0), igraph (>= 0.7.0), methods (>= 3.1.0), multtest (>=
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8192598
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_ade4_version.patch

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