[med-svn] r23093 - in trunk/packages/R/r-bioc-phyloseq/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2016-11-17 16:40:27 +0000 (Thu, 17 Nov 2016)
New Revision: 23093

Added:
   trunk/packages/R/r-bioc-phyloseq/trunk/debian/patches/
   trunk/packages/R/r-bioc-phyloseq/trunk/debian/patches/fix_ade4_version.patch
   trunk/packages/R/r-bioc-phyloseq/trunk/debian/patches/series
Modified:
   trunk/packages/R/r-bioc-phyloseq/trunk/debian/changelog
Log:
Fix versioned dependency from ade4


Modified: trunk/packages/R/r-bioc-phyloseq/trunk/debian/changelog
===================================================================
--- trunk/packages/R/r-bioc-phyloseq/trunk/debian/changelog	2016-11-17 14:24:45 UTC (rev 23092)
+++ trunk/packages/R/r-bioc-phyloseq/trunk/debian/changelog	2016-11-17 16:40:27 UTC (rev 23093)
@@ -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
 

Added: trunk/packages/R/r-bioc-phyloseq/trunk/debian/patches/fix_ade4_version.patch
===================================================================
--- trunk/packages/R/r-bioc-phyloseq/trunk/debian/patches/fix_ade4_version.patch	                        (rev 0)
+++ trunk/packages/R/r-bioc-phyloseq/trunk/debian/patches/fix_ade4_version.patch	2016-11-17 16:40:27 UTC (rev 23093)
@@ -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 (>=

Added: trunk/packages/R/r-bioc-phyloseq/trunk/debian/patches/series
===================================================================
--- trunk/packages/R/r-bioc-phyloseq/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/R/r-bioc-phyloseq/trunk/debian/patches/series	2016-11-17 16:40:27 UTC (rev 23093)
@@ -0,0 +1 @@
+fix_ade4_version.patch