From ee2b6beb138f1d5006401c019d31a18c226c523a Mon Sep 17 00:00:00 2001
From: DavisVaughan <davis@rstudio.com>
Date: Mon, 12 Apr 2021 11:45:13 -0400
Subject: [PATCH 1/5] Add a note to NEWS about conflict with lubridate

---
 NEWS.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS.md b/NEWS.md
index b3aeb4cc..62559ae9 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -30,7 +30,9 @@
 * New `as_date()` and `as_date_time()` for converting to Date and POSIXct
   respectively. Unlike `as.Date()` and `as.POSIXct()`, these functions always
   treat Date as a naive-time type, which results in more consistent and
-  intuitive conversions (#209).
+  intuitive conversions. Note that `as_date()` does conflict with
+  `lubridate::as_date()`, and the lubridate version handles Dates differently
+  (#209).
 
 * Added two new convenient helpers (#197):
 

From 4abc68389df1cb206f01e686d1f23bff2d413e0f Mon Sep 17 00:00:00 2001
From: DavisVaughan <davis@rstudio.com>
Date: Mon, 12 Apr 2021 12:02:42 -0400
Subject: [PATCH 2/5] Update CRAN comments

---
 cran-comments.md | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/cran-comments.md b/cran-comments.md
index 68456c7b..5e42ec20 100644
--- a/cran-comments.md
+++ b/cran-comments.md
@@ -1,13 +1,10 @@
 ## R CMD check results
 
-0 errors | 0 warnings | 2 notes
+0 errors | 0 warnings | 0 notes
 
-* This is a new release.
+## 0.2.0 Submission
 
-* checking installed package size ... NOTE
-    installed size is  7.8Mb
-    sub-directories of 1Mb or more:
-      libs   5.6Mb
+This is a minor release to fix the error on CRAN's Solaris build, and add a few new features.
 
 ## 0.1.0 Submission
 

From c657c6b201e62b72da66ef8ac9df54bd80217409 Mon Sep 17 00:00:00 2001
From: DavisVaughan <davis@rstudio.com>
Date: Mon, 12 Apr 2021 12:03:03 -0400
Subject: [PATCH 3/5] Increment version number

---
 DESCRIPTION | 2 +-
 NEWS.md     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 64ecf66b..27b9eb41 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: clock
 Title: Date-Time Types and Tools
-Version: 0.1.0.9001
+Version: 0.2.0
 Authors@R: 
     c(person(given = "Davis",
              family = "Vaughan",
diff --git a/NEWS.md b/NEWS.md
index 62559ae9..f857dda9 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,4 +1,4 @@
-# clock (development version)
+# clock 0.2.0
 
 * clock now interprets R's Date class as _naive-time_ rather than _sys-time_.
   This means that it no longer assumes that Date has an implied time zone of

From 205fdf73d98934b1b94c117310063194220a193c Mon Sep 17 00:00:00 2001
From: DavisVaughan <davis@rstudio.com>
Date: Mon, 12 Apr 2021 13:23:50 -0400
Subject: [PATCH 4/5] CRAN-RELEASE

---
 CRAN-RELEASE | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 CRAN-RELEASE

diff --git a/CRAN-RELEASE b/CRAN-RELEASE
new file mode 100644
index 00000000..4aed82b3
--- /dev/null
+++ b/CRAN-RELEASE
@@ -0,0 +1,2 @@
+This package was submitted to CRAN on 2021-04-12.
+Once it is accepted, delete this file and tag the release (commit c657c6b).

From 6c91486beef852bfd0e9ab0932d2df8e02fd362c Mon Sep 17 00:00:00 2001
From: DavisVaughan <davis@rstudio.com>
Date: Mon, 12 Apr 2021 17:17:30 -0400
Subject: [PATCH 5/5] Delete CRAN-RELEASE

---
 CRAN-RELEASE | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 CRAN-RELEASE

diff --git a/CRAN-RELEASE b/CRAN-RELEASE
deleted file mode 100644
index 4aed82b3..00000000
--- a/CRAN-RELEASE
+++ /dev/null
@@ -1,2 +0,0 @@
-This package was submitted to CRAN on 2021-04-12.
-Once it is accepted, delete this file and tag the release (commit c657c6b).