diff -Nru r-bioc-biocgenerics-0.24.0/debian/changelog r-bioc-biocgenerics-0.24.0/debian/changelog --- r-bioc-biocgenerics-0.24.0/debian/changelog 2017-11-08 22:38:20.000000000 +0000 +++ r-bioc-biocgenerics-0.24.0/debian/changelog 2018-04-12 16:31:15.000000000 +0000 @@ -1,3 +1,9 @@ +r-bioc-biocgenerics (0.24.0-1ubuntu2) bionic; urgency=medium + + * Drop Ubuntu changes since we now have r-base >= 3.4.3 + + -- Graham Inggs Thu, 12 Apr 2018 16:31:15 +0000 + r-bioc-biocgenerics (0.24.0-1ubuntu1) bionic; urgency=medium * Merge with Debian unstable, remaining changes: diff -Nru r-bioc-biocgenerics-0.24.0/debian/control r-bioc-biocgenerics-0.24.0/debian/control --- r-bioc-biocgenerics-0.24.0/debian/control 2017-11-08 22:38:20.000000000 +0000 +++ r-bioc-biocgenerics-0.24.0/debian/control 2017-11-07 16:23:50.000000000 +0000 @@ -1,6 +1,5 @@ Source: r-bioc-biocgenerics -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Med Packaging Team +Maintainer: Debian Med Packaging Team Uploaders: Andreas Tille Section: gnu-r Priority: optional diff -Nru r-bioc-biocgenerics-0.24.0/debian/patches/disable_hotfix73465.patch r-bioc-biocgenerics-0.24.0/debian/patches/disable_hotfix73465.patch --- r-bioc-biocgenerics-0.24.0/debian/patches/disable_hotfix73465.patch 2017-10-13 07:05:16.000000000 +0000 +++ r-bioc-biocgenerics-0.24.0/debian/patches/disable_hotfix73465.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -Description: Disable hotfix 73465 - We already have this fix in r-base 3.4.2-1ubuntu1. -Forwarded: not-needed -Author: Graham Inggs -Last-Update: 2017-10-13 ---- a/R/hotfix73465.R -+++ b/R/hotfix73465.R -@@ -58,7 +58,7 @@ - if (R.Version()[["major"]] != "3" || R.Version()[["minor"]] != "4.2") - return() - svn_rev <- as.integer(R.Version()[["svn rev"]]) -- if (svn_rev >= 73465) -+ if (svn_rev >= 73368) - return() - stopifnot(is(FUN, "standardGeneric")) - envir <- environment(FUN) diff -Nru r-bioc-biocgenerics-0.24.0/debian/patches/series r-bioc-biocgenerics-0.24.0/debian/patches/series --- r-bioc-biocgenerics-0.24.0/debian/patches/series 2017-10-13 06:01:17.000000000 +0000 +++ r-bioc-biocgenerics-0.24.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -disable_hotfix73465.patch