diff --git a/daemon/configure.ac b/daemon/configure.ac index ac5a41e9b7f522a36736b4466bc54174c6f1457f..e11283c1ee5c4e951ce311a1ce424293a149016a 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 f09a5731e17116d7a06036b002017ee9f40dfb27..b840a995d266ebaede54707ed072951907625c61 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 fc8df73232d317777feabda4ad2010967e16ff66..51b71cb8dc1657e479fa4971ab31a49576a639b0 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 50668c739cfffa316a8553c2fc47ef7079075a1b..ea5df865a4f64f09fc9c4c417c0c851357d6ddc8 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 9797b6dbd3b64f6ec1b8194d11d859f9261c27a5..9b54d898828cfa1fe6f59bb6c05924aaf96090fa 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 0cbf773dda9b65c2d1c3d8975bce3dc270e5ac74..771f222c6e660b4186208c10cba06faaadbda659 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 aca9090f7f7f4eb729a50e031a50975f1c33fbb9..49168605bb40a38d84994aef13e0335c0322d0be 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