From 13aa9c1b164088cef71b0ff68621b413ff6fe513 Mon Sep 17 00:00:00 2001 From: Tristan Matthews Date: Tue, 15 Jul 2014 15:23:19 -0400 Subject: [PATCH] Bump version numbers for Release 1.4.0 Refs #51465 Change-Id: I1789783172e57c0c14c31f40f939bb174047f7a1 --- NEWS | 2 ++ 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 ++++- 8 files changed, 12 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index 580aa7ad9..9ddd14d71 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,8 @@ # # # +* 2014-07-15: 1.4.0 has been released + * 2014-04-21: SFLphone is now using Gerrit * 2014-01-13: 1.3.0 has been released diff --git a/daemon/configure.ac b/daemon/configure.ac index 979b14845..a0b9c5aae 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.3.0],[sflphoneteam@savoirfairelinux.com],[sflphone]) +AC_INIT([sflphone],[1.4.0],[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 ed0964c10..d26541c1c 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.3.0 +PROJECT_NUMBER = 1.4.0 # 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 b2acb6c70..2beddbd08 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_3_0_3 +#define AUDIO_CODEC_ENTRY create_1_4_0_0 #define AUDIO_CODEC_ENTRY_SYMBOL XSTR(AUDIO_CODEC_ENTRY) // Opus documentation: diff --git a/gnome/configure.ac b/gnome/configure.ac index 903025f9c..2b512b521 100644 --- a/gnome/configure.ac +++ b/gnome/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.64]) -AC_INIT([sflphone],[1.3.0],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome]) +AC_INIT([sflphone],[1.4.0],[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 7cc09ec70..fdfe19308 100644 --- a/plugins/configure.ac +++ b/plugins/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([sflphone],[1.3.0],[sflphoneteam@savoirfairelinux.com],[sflphone-plugins]) +AC_INIT([sflphone],[1.4.0],[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 8d300a3ad..e5998bbe8 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.3.0" +VERSION_NUMBER="1.4.0" 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 26f253dbe..d58f591f3 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.3.0 +Version: 1.4.0 %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 - 1.4.0-1 +- Update to 1.4.0 + * Wed Jul 9 2014 Tristan Matthews - 1.3.0-5 - Drop uuid dependency