summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Helleu <flashcode@flashtux.org>2015-05-10 09:24:50 +0200
committerSébastien Helleu <flashcode@flashtux.org>2015-05-10 09:24:50 +0200
commit66abd51786936584aa58af9ce8076d286854de0f (patch)
treed4b41ac6470e52029ab35796b5db99ae45766211
parent43fa9df6c2a8b29fbbd2ac66dd6e8d3b2d7cae5a (diff)
downloadweechat-66abd51786936584aa58af9ce8076d286854de0f.zip
Version 1.2
-rw-r--r--CMakeLists.txt2
-rw-r--r--ChangeLog.asciidoc2
-rw-r--r--ReleaseNotes.asciidoc2
-rw-r--r--configure.ac2
-rw-r--r--weechat.spec4
5 files changed, 7 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5f6d19aa..e97966e6f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@ endif()
# version
set(VERSION_MAJOR "1")
-set(VERSION_MINOR "2-rc2")
+set(VERSION_MINOR "2")
set(VERSION_PATCH "")
if(VERSION_PATCH STREQUAL "")
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR})
diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc
index 59d0b7ea9..f881d40a7 100644
--- a/ChangeLog.asciidoc
+++ b/ChangeLog.asciidoc
@@ -15,7 +15,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
(file 'ReleaseNotes.asciidoc' in sources).
-== Version 1.2 (under dev)
+== Version 1.2 (2015-05-10)
=== New features
diff --git a/ReleaseNotes.asciidoc b/ReleaseNotes.asciidoc
index 579272cb3..80414dcc9 100644
--- a/ReleaseNotes.asciidoc
+++ b/ReleaseNotes.asciidoc
@@ -17,7 +17,7 @@ https://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]
(file 'ChangeLog.asciidoc' in sources).
-== Version 1.2 (under dev)
+== Version 1.2 (2015-05-10)
The word chars are now customizable with two options:
diff --git a/configure.ac b/configure.ac
index 3abc0f332..2ad10bb9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.56)
-AC_INIT(WeeChat, 1.2-rc2, flashcode@flashtux.org)
+AC_INIT(WeeChat, 1.2, flashcode@flashtux.org)
AC_CONFIG_SRCDIR([configure.ac])
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE([foreign])
diff --git a/weechat.spec b/weechat.spec
index 40238fc70..5628cccfb 100644
--- a/weechat.spec
+++ b/weechat.spec
@@ -23,7 +23,7 @@
#
%define name weechat
-%define version 1.1.1
+%define version 1.2
%define release 1
Name: %{name}
@@ -77,6 +77,8 @@ rm -rf $RPM_BUILD_ROOT
%{_prefix}/share/icons/hicolor/32x32/apps/weechat.png
%changelog
+* Sun May 10 2015 Sébastien Helleu <flashcode@flashtux.org> 1.2-1
+- Released version 1.2
* Sun Jan 25 2015 Sébastien Helleu <flashcode@flashtux.org> 1.1.1-1
- Released version 1.1.1
* Sun Jan 11 2015 Sébastien Helleu <flashcode@flashtux.org> 1.1-1