changeset 90:de1c1e4a5dbb release-2.0 2.0.2

Misc: update before 2.0.2 release
author David Demelier <markand@malikania.fr>
date Tue, 19 Apr 2016 10:14:48 +0200
parents 9fa11151f492
children 02409acc34e2
files CHANGES.md cmake/IrccdVersion.cmake doc/procs/00.new-release.md
diffstat 3 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES.md	Mon Apr 18 19:52:38 2016 +0200
+++ b/CHANGES.md	Tue Apr 19 10:14:48 2016 +0200
@@ -1,6 +1,11 @@
 IRC Client Daemon CHANGES
 =========================
 
+irccd 2.0.2 2016-04-19
+----------------------
+
+  - Fix CMake error preventing installation of irccd and irccdctl.
+
 irccd 2.0.1 2016-03-13
 ----------------------
 
--- a/cmake/IrccdVersion.cmake	Mon Apr 18 19:52:38 2016 +0200
+++ b/cmake/IrccdVersion.cmake	Tue Apr 19 10:14:48 2016 +0200
@@ -19,7 +19,7 @@
 # Irccd version.
 set(IRCCD_VERSION_MAJOR "2")
 set(IRCCD_VERSION_MINOR "0")
-set(IRCCD_VERSION_PATCH "1")
+set(IRCCD_VERSION_PATCH "2")
 set(IRCCD_VERSION "${IRCCD_VERSION_MAJOR}.${IRCCD_VERSION_MINOR}.${IRCCD_VERSION_PATCH}")
 
 #
@@ -31,8 +31,8 @@
 # IRCCD_RELEASE_DATE_DAY	2 digits (01 = first day of month)
 #
 set(IRCCD_RELEASE_DATE_YEAR 2016)
-set(IRCCD_RELEASE_DATE_MONTH 03)
-set(IRCCD_RELEASE_DATE_DAY 13)
+set(IRCCD_RELEASE_DATE_MONTH 04)
+set(IRCCD_RELEASE_DATE_DAY 19)
 set(IRCCD_RELEASE_DATE "${IRCCD_RELEASE_DATE_YEAR}-${IRCCD_RELEASE_DATE_MONTH}-${IRCCD_RELEASE_DATE_DAY}")
 
 # All plugins.
--- a/doc/procs/00.new-release.md	Mon Apr 18 19:52:38 2016 +0200
+++ b/doc/procs/00.new-release.md	Tue Apr 19 10:14:48 2016 +0200
@@ -43,10 +43,10 @@
 
     $ hg update stable-2
     $ hg merge release-2.0
-    $ hg ci -m "Merge with release-2.0"
+    $ hg ci -m "Merge from release-2.0"
     $ hg up @
     $ hg merge release-2.0
-    $ hg ci -m "Merge with stable-2"
+    $ hg ci -m "Merge from stable-2"
     $ hg push
 
 9. Create the package