From 556d9ecf5a32f657ca05e1efbde08fbea0a90f5a Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Thu, 25 Sep 2014 17:55:37 -0400
Subject: [PATCH] Onward to 1.4.2
Refs #55550
Change-Id: I08c83c598c2c1db37ea8e58c564cf46d9ee077d7
---
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 ac5a41e9b7..e11283c1ee 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.1],[sflphoneteam@savoirfairelinux.com],[sflphone])
+AC_INIT([sflphone],[1.4.2],[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 f09a5731e1..b840a995d2 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.1
+PROJECT_NUMBER = 1.4.2
# 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 fc8df73232..51b71cb8dc 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_1_0
+#define AUDIO_CODEC_ENTRY create_1_4_2_0
#define AUDIO_CODEC_ENTRY_SYMBOL XSTR(AUDIO_CODEC_ENTRY)
// Opus documentation:
diff --git a/gnome/configure.ac b/gnome/configure.ac
index 50668c739c..ea5df865a4 100644
--- a/gnome/configure.ac
+++ b/gnome/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.64])
-AC_INIT([sflphone],[1.4.1],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome])
+AC_INIT([sflphone],[1.4.2],[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 9797b6dbd3..9b54d89882 100644
--- a/plugins/configure.ac
+++ b/plugins/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([sflphone],[1.4.1],[sflphoneteam@savoirfairelinux.com],[sflphone-plugins])
+AC_INIT([sflphone],[1.4.2],[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 0cbf773dda..771f222c6e 100755
--- a/tools/build-system/launch-build-machine-jenkins.sh
+++ b/tools/build-system/launch-build-machine-jenkins.sh
@@ -26,7 +26,7 @@ DO_LOGGING=1
DO_UPLOAD=1
SNAPSHOT_TAG=`date +%Y%m%d`
TAG_NAME_PREFIX=
-VERSION_NUMBER="1.4.1"
+VERSION_NUMBER="1.4.2"
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 aca9090f7f..49168605bb 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.1
+Version: 1.4.2
%if 0%{?nightly}
%define rel rc%{nightly}
%define tarball %{name}-%{version}-rc%{nightly}
@@ -277,6 +277,9 @@ fi
%exclude %{_includedir}/qtsflphone/*.h
%changelog
+* Thu Sep 25 2014 Tristan Matthews <tristan.matthews@savoirfairelinux.com> - 1.4.2-1
+- Bump version after release
+
* Fri Sep 12 2014 Tristan Matthews <tristan.matthews@savoirfairelinux.com> - 1.4.1-5
- Enable opus
--
GitLab