This is an automated email from the git hooks/post-receive script. bob.dybian-guest pushed a commit to branch master in repository r-cran-ape.
commit a3a7045c508f4777719bea99866120e01f2f82da Author: Dylan Aïssi <[email protected]> Date: Sat Jul 12 17:21:26 2014 +0200 Removed patch, accepted upstream --- debian/patches/01_Fix_PhyML_bin_location.patch | 20 -------------------- debian/patches/series | 1 - 2 files changed, 21 deletions(-) diff --git a/debian/patches/01_Fix_PhyML_bin_location.patch b/debian/patches/01_Fix_PhyML_bin_location.patch deleted file mode 100644 index 6344eb6..0000000 --- a/debian/patches/01_Fix_PhyML_bin_location.patch +++ /dev/null @@ -1,20 +0,0 @@ -Author: Dylan Aïssi <[email protected]> -Description: Fix PhyML binary location in Debian, Fedora packages and maybe for - others distributions. -Applied-Upstream: ape (> 3.1-2) - ---- a/R/phymltest.R -+++ b/R/phymltest.R -@@ -26,7 +26,11 @@ - os <- Sys.info()[1] - ## default names of PhyML: - if (is.null(execname)) { -- if (os == "Linux") execname <- "phyml_3.0.1_linux32" -+ if (os == "Linux") { -+ # PhyML location for Debian and Fedora packages and maybe for others distributions -+ if (file.exists("/usr/bin/phyml")) execname <- "/usr/bin/phyml" -+ else execname <- "phyml_3.0.1_linux32" -+ } - if (os == "Darwin") execname <- "phyml_3.0.1_macintel" - if (os == "Windows") execname <- "phyml_3.0.1_win32" - } diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index bb25a51..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01_Fix_PhyML_bin_location.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-cran-ape.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
