From e15abefa041e12dc36cce1d827f51e6ce192cefb Mon Sep 17 00:00:00 2001
From: Johannes Ranke <jranke@uni-bremen.de>
Date: Wed, 7 Oct 2015 17:53:25 +0200
Subject: Maintenance changes for the release of version 0.1-36

---
 DESCRIPTION     | 10 +++++-----
 GNUmakefile     | 16 ++++++++++++----
 NAMESPACE       |  5 +++++
 man/din32645.Rd |  4 ++--
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index cf14423..e6e6384 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,17 +1,17 @@
 Package: chemCal
-Version: 0.1-35.900
-Date: 2015-08-22
-Title: Calibration functions for analytical chemistry
+Version: 0.1-36
+Date: 2015-10-07
+Title: Calibration Functions for Analytical Chemistry
 Authors@R: c(person("Johannes", "Ranke", role = c("aut", "cre", "cph"), 
                     email = "jranke@uni-bremen.de"))
 Suggests: MASS
-Description: chemCal provides simple functions for plotting linear
+Description: Simple functions for plotting linear
 	calibration functions and estimating standard errors for measurements
 	according to the Handbook of Chemometrics and Qualimetrics: Part A
 	by Massart et al. There are also functions estimating the limit
 	of detection (LOD) and limit of quantification (LOQ).
 	The functions work on model objects from - optionally weighted - linear
-	regression (lm) or robust linear regression (rlm from the MASS package).
+	regression (lm) or robust linear regression ('rlm' from the 'MASS' package).
 License: GPL (>= 2)
 URL: http://www.r-project.org, 
 	http://www.uft.uni-bremen.de/chemie/ranke,
diff --git a/GNUmakefile b/GNUmakefile
index a2d88be..c0d78e3 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,6 +1,7 @@
 PKGNAME := $(shell sed -n "s/Package: *\([^ ]*\)/\1/p" DESCRIPTION)
 PKGVERS := $(shell sed -n "s/Version: *\([^ ]*\)/\1/p" DESCRIPTION)
 PKGSRC  := $(shell basename $(PWD))
+TGZ     := ../$(PKGNAME)_$(PKGVERS).tar.gz
 
 # Specify the directory holding R binaries. To use an alternate R build (say a
 # pre-prelease version) use `make RBIN=/path/to/other/R/` or `export RBIN=...`
@@ -22,6 +23,7 @@ help:
 	@echo "  check-no-vignettes      Invoke build without rebuilding vignettes, and then check"
 	@echo "  install                 Invoke build and then install the result"
 	@echo "  install-no-vignettes    Invoke build without rebuilding vignettes and then install the result"
+	@echo "  winbuilder              Upload the build to winbuilder"
 	@echo ""
 	@echo "Using R in: $(RBIN)"
 	@echo "Set the RBIN environment variable to change this."
@@ -42,21 +44,27 @@ build-no-vignettes:
 
 install: build
 	cd ..;\
-		"$(RBIN)/R" CMD INSTALL $(PKGNAME)_$(PKGVERS).tar.gz
+		"$(RBIN)/R" CMD INSTALL $(TGZ)
 
 install-no-vignettes: build-no-vignettes
 	cd ..;\
-		"$(RBIN)/R" CMD INSTALL $(PKGNAME)_$(PKGVERS).tar.gz
+		"$(RBIN)/R" CMD INSTALL $(TGZ)
 
 check: build
 	cd ..;\
-		"$(RBIN)/R" CMD check --as-cran $(PKGNAME)_$(PKGVERS).tar.gz
+		"$(RBIN)/R" CMD check --as-cran $(TGZ)
 
 check-no-vignettes: build-no-vignettes
 	cd ..;\
-		"$(RBIN)/R" CMD check --as-cran $(PKGNAME)_$(PKGVERS).tar.gz
+		"$(RBIN)/R" CMD check --as-cran $(TGZ)
 
 sd:
 	@echo Now execute
 	@echo "\n  staticdocs::build_site()\n"
 	$(RBIN)/R
+
+winbuilder: build
+	@echo "Uploading to R-release on win-builder"
+	curl -T $(TGZ) ftp://anonymous@win-builder.r-project.org/R-release/
+	@echo "Uploading to R-devel on win-builder"
+	curl -T $(TGZ) ftp://anonymous@win-builder.r-project.org/R-devel/
diff --git a/NAMESPACE b/NAMESPACE
index 6314e29..7daafff 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -1,6 +1,11 @@
 # Export all names
 exportPattern(".")
+S3method(calplot, default)
+S3method(calplot, lm)
+S3method(lod, default)
 S3method(lod, lm)
+S3method(loq, default)
 S3method(loq, lm)
+S3method(inverse.predict, default)
 S3method(inverse.predict, lm)
 S3method(inverse.predict, rlm)
diff --git a/man/din32645.Rd b/man/din32645.Rd
index cacbf07..12c641a 100644
--- a/man/din32645.Rd
+++ b/man/din32645.Rd
@@ -51,8 +51,8 @@ round(loq$x,4)
   DIN 32645 (equivalent to ISO 11843), Beuth Verlag, Berlin, 1994
 
   Dintest. Plugin for MS Excel for evaluations of calibration data. Written
-  by Georg Schmitt, University of Heidelberg. 
-  \url{http://www.rzuser.uni-heidelberg.de/~df6/download/dintest.htm}
+  by Georg Schmitt, University of Heidelberg. Formerly available from
+  the Website of the University of Heidelberg.
 
   Currie, L. A. (1997) Nomenclature in evaluation of analytical methods including
   detection and quantification capabilities (IUPAC Recommendations 1995). 
-- 
cgit v1.2.1