Mercurial > irccd

changeset 94:339808b0c007

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from stable-2
author David Demelier <markand@malikania.fr>
date Tue, 19 Apr 2016 10:17:52 +0200
parents 1c616f54d688 (current diff) 47fd3f6b32c5 (diff)
children 1125d90b3b44
files cmake/IrccdVersion.cmake
diffstat 5 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsigs	Thu Apr 07 13:21:54 2016 +0200
+++ b/.hgsigs	Tue Apr 19 10:17:52 2016 +0200
@@ -1,2 +1,3 @@
 223487a685b101f5bcbd3e6a7f457d551953bf99 0 iQEcBAABCAAGBQJW1UpnAAoJEKHa+bhAI/MfKRQH/jdmDihcOvqa+4njFcdeUEeonW7YZbRyJenz3fuitMSBu0QdfIHcaSMZlHE7lFTpaj7kEjjssrpPcbjSxkIemi2FHoCkXmHBGYVMQxhHLko5m339FzvXXrK24W6e1IUygTE0iSKEAUjg0Li8U1OY2WPvvOHyNaissbd9AMCBDL38cuudq+jsC9YO/b1UXekuw25f9sLmNpvf4IkmyVbZ0VYnMe4/FmLDfz5OWpjqaFJeVqX46Zd71zbe2ISuHOec+o1RUPAOwyGpZeoOfjoZ20K/OrsZCbpcEZX86u/mW25cKcryJzB66WHJUKz9/UpqwB9kt1nGUClM9xISWz3UPOo=
 79de523688edfb418f0f9605033a2c8dac1cd7cf 0 iQEcBAABCAAGBQJW5dzPAAoJEKHa+bhAI/Mf0qIH/jmb/2Oltif7R2kSeQcW9NHfPlqF/gvOIN5FaraoYdkwHumwLxys5FzhIghkJgvNMT313Xez0UjtdSO/3ZmjX1P+D/Rz3NfMddFDyiXWMn8D/MVN6DskQw6mb4W9miB0fBl++pc4e7T0UvZdYar4ddOl6WE2HDda6828gq2ecBBEyTkPOglzbiRwm05zmAvE5DxjEElu/2V70oHJJUscHOnC8YZVJnav1Hq6iU5RTpmuBtY7TN6/+Q7i9o+4b1xkQ8zAVpu9gBo7ptVhQ8MSnIprwO+E8XFmQDA/67tDgquzURZvVRmehMCaWhljWVLTG3CVOVQEp/k9ip5CKRoE+oY=
+02409acc34e21fa08a781f6f68aef66dc734a132 0 iQEcBAABCAAGBQJXFekwAAoJEKHa+bhAI/MfxG4IAK9Es4VcTU5HZ+VfpuFxjx5NcbEzbdqexUFI4m4Z8/LWD7Xb9RT0bekomEDHGT91csQFJ1es1Aeekbgw1XDk/wwYphaTUTNKF8L9VWRKdRbGQT8AjkOxJXfjMviGJbUa7lkQNllwLexvwPmnMJP8+A/QVf5EWlim8rxpeaKqrpwmizd4UhvLb7w5F5YyIHVsI8FizFL9VdnFplK+iQgSMX2mRUkAGOHCno7MIxilcmUGy/6yzV7VyuJHmkGjluBxURp73HQSAIVM3SwJagpWZS6zZ5tI5PFf6gw9rlByJJOLcbuuvUaAKLYhKISi5qlLmKRW097sJxCF4bgWfUVUp1w=
--- a/.hgtags	Thu Apr 07 13:21:54 2016 +0200
+++ b/.hgtags	Tue Apr 19 10:17:52 2016 +0200
@@ -1,2 +1,3 @@
 92b0be5ce4b0cc77254585563069719e01c575d5 2.0.0
 02bb385da6e342bbfe232b10ab6d63c1d8c47ca7 2.0.1
+de1c1e4a5dbb3f9d03a6833333f03f595f79e33d 2.0.2
--- a/CHANGES.md	Thu Apr 07 13:21:54 2016 +0200
+++ b/CHANGES.md	Tue Apr 19 10:17:52 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	Thu Apr 07 13:21:54 2016 +0200
+++ b/cmake/IrccdVersion.cmake	Tue Apr 19 10:17:52 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_SHLIB "2")
 set(IRCCD_VERSION "${IRCCD_VERSION_MAJOR}.${IRCCD_VERSION_MINOR}.${IRCCD_VERSION_PATCH}")
 
@@ -32,8 +32,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	Thu Apr 07 13:21:54 2016 +0200
+++ b/doc/procs/00.new-release.md	Tue Apr 19 10:17:52 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