From 1052aba247513d65530d62d28bc77fc4d91b700c Mon Sep 17 00:00:00 2001 From: Ben Stevenson Date: Mon, 6 Jun 2016 14:38:11 +0100 Subject: [PATCH] Version bump. --- DESCRIPTION | 4 ++-- Makefile | 6 +++--- NEWS | 5 +++++ inst/scripts/install.r | 6 +++--- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 8713030..919357d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: admbsecr Type: Package Title: SECR models with supplementary location information -Version: 1.2.1 -Date: 2016-05-16 +Version: 1.2.2 +Date: 2016-06-06 Author: Ben Stevenson , David Borchers Maintainer: Ben Stevenson diff --git a/Makefile b/Makefile index c26221b..9a9000e 100644 --- a/Makefile +++ b/Makefile @@ -38,13 +38,13 @@ roxygen: build: R CMD build --resave-data . mkdir -p package-build - mv admbsecr_1.2.1.tar.gz package-build/ + mv admbsecr_1.2.2.tar.gz package-build/ check: - R CMD check package-build/admbsecr_1.2.1.tar.gz --no-tests + R CMD check package-build/admbsecr_1.2.2.tar.gz --no-tests install: - R CMD INSTALL package-build/admbsecr_1.2.1.tar.gz --install-tests + R CMD INSTALL package-build/admbsecr_1.2.2.tar.gz --install-tests pdf: R CMD Rd2pdf --pdf . & diff --git a/NEWS b/NEWS index 4c1cecb..1334fa2 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +admbsecr 1.2.2 +-------------- + +* Minor bug fixes. + admbsecr 1.2.1 -------------- diff --git a/inst/scripts/install.r b/inst/scripts/install.r index 0943e5d..cc8f363 100644 --- a/inst/scripts/install.r +++ b/inst/scripts/install.r @@ -8,17 +8,17 @@ for (i in pkgs){ } options(warn = 0) if (.Platform$OS == "windows"){ - bin.name <- "https://github.com/b-steve/admbsecr/releases/download/v1.2.1/admbsecr_1.2.1.zip" + bin.name <- "https://github.com/b-steve/admbsecr/releases/download/v1.2.2/admbsecr_1.2.2.zip" ext <- ".zip" type <- "win.binary" } else if (.Platform$OS == "unix"){ - bin.name <- "https://github.com/b-steve/admbsecr/archive/v1.2.1.tar.gz" + bin.name <- "https://github.com/b-steve/admbsecr/archive/v1.2.2.tar.gz" ext <- ".tar.gz" type <- "source" } else { stop("Unknown OS type.") } -dest <- paste("admbsecr_1.2.1", ext, sep = "") +dest <- paste("admbsecr_1.2.2", ext, sep = "") library(downloader) download(bin.name, destfile = dest) install.packages(dest, repos = NULL, type = type)