From a0f7803ffec702a04b130b0d35e3c20e26089586 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Tue, 15 Jul 2014 18:32:53 -0400
Subject: [PATCH] Start development of 1.4.1
From now on, version numbers will be incremented immediately after
tagging a release. NEWS is deliberately omitted, since it should
be updated before tagging a release (since it announces a new release).
Refs #51465
Change-Id: Ic763f2d19dfc8a7b292a8ece163f7064983c9f07
---
daemon/configure.ac | 2 +-
daemon/doc/doxygen/core-doc.cfg.in | 2 +-
daemon/src/audio/codecs/audiocodec.h | 2 +-
gnome/configure.ac | 2 +-
plugins/configure.ac | 2 +-
tools/build-system/launch-build-machine-jenkins.sh | 2 +-
tools/build-system/rpm/sflphone.spec | 5 ++++-
7 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/daemon/configure.ac b/daemon/configure.ac
index a0b9c5aae1..3e41e4e8b7 100644
--- a/daemon/configure.ac
+++ b/daemon/configure.ac
@@ -2,7 +2,7 @@ dnl SFLPhone - configure.ac for automake 1.9 and autoconf 2.59
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.65])
-AC_INIT([sflphone],[1.4.0],[sflphoneteam@savoirfairelinux.com],[sflphone])
+AC_INIT([sflphone],[1.4.1],[sflphoneteam@savoirfairelinux.com],[sflphone])
AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014]])
AC_REVISION([$Revision$])
diff --git a/daemon/doc/doxygen/core-doc.cfg.in b/daemon/doc/doxygen/core-doc.cfg.in
index d26541c1c1..3eb1b852ae 100644
--- a/daemon/doc/doxygen/core-doc.cfg.in
+++ b/daemon/doc/doxygen/core-doc.cfg.in
@@ -31,7 +31,7 @@ PROJECT_NAME = "SFLphone Daemon"
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 1.4.0
+PROJECT_NUMBER = 1.4.1
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer
diff --git a/daemon/src/audio/codecs/audiocodec.h b/daemon/src/audio/codecs/audiocodec.h
index 2beddbd087..fc8df73232 100644
--- a/daemon/src/audio/codecs/audiocodec.h
+++ b/daemon/src/audio/codecs/audiocodec.h
@@ -40,7 +40,7 @@
#define STR(s) #s
/* bump for each release, and bump the 0.0.0.xth digit for each API change */
-#define AUDIO_CODEC_ENTRY create_1_4_0_0
+#define AUDIO_CODEC_ENTRY create_1_4_1_0
#define AUDIO_CODEC_ENTRY_SYMBOL XSTR(AUDIO_CODEC_ENTRY)
// Opus documentation:
diff --git a/gnome/configure.ac b/gnome/configure.ac
index 2b512b5212..50668c739c 100644
--- a/gnome/configure.ac
+++ b/gnome/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.64])
-AC_INIT([sflphone],[1.4.0],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome])
+AC_INIT([sflphone],[1.4.1],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
diff --git a/plugins/configure.ac b/plugins/configure.ac
index fdfe19308d..9797b6dbd3 100644
--- a/plugins/configure.ac
+++ b/plugins/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([sflphone],[1.4.0],[sflphoneteam@savoirfairelinux.com],[sflphone-plugins])
+AC_INIT([sflphone],[1.4.1],[sflphoneteam@savoirfairelinux.com],[sflphone-plugins])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([build-aux])
diff --git a/tools/build-system/launch-build-machine-jenkins.sh b/tools/build-system/launch-build-machine-jenkins.sh
index e5998bbe83..4ac83f90be 100755
--- a/tools/build-system/launch-build-machine-jenkins.sh
+++ b/tools/build-system/launch-build-machine-jenkins.sh
@@ -46,7 +46,7 @@ DO_LOGGING=1
DO_UPLOAD=1
SNAPSHOT_TAG=`date +%Y%m%d`
TAG_NAME_PREFIX=
-VERSION_NUMBER="1.4.0"
+VERSION_NUMBER="1.4.1"
LAUNCHPAD_PACKAGES=("sflphone-daemon" "sflphone-kde" "sflphone-gnome" "sflphone-plugins" "sflphone-daemon-video" "sflphone-gnome-video")
diff --git a/tools/build-system/rpm/sflphone.spec b/tools/build-system/rpm/sflphone.spec
index d58f591f3b..3b20282f6a 100644
--- a/tools/build-system/rpm/sflphone.spec
+++ b/tools/build-system/rpm/sflphone.spec
@@ -1,6 +1,6 @@
%bcond_with video
Name: sflphone
-Version: 1.4.0
+Version: 1.4.1
%if 0%{?nightly}
%define rel rc%{nightly}
%define tarball %{name}-%{version}-rc%{nightly}
@@ -267,6 +267,9 @@ fi
%endif
%changelog
+* Tue Jul 15 2014 Tristan Matthews <tristan.matthews@savoirfairelinux.com> - 1.4.1-1
+- Start development of 1.4.1
+
* Tue Jul 15 2014 Tristan Matthews <tristan.matthews@savoirfairelinux.com> - 1.4.0-1
- Update to 1.4.0
--
GitLab