diff --git a/NEWS b/NEWS index 3dff759009fca759ec351d17450dba4ce489f7b1..d1f48c548a75cabb077b372d5dc2fee00d241d82 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,8 @@ ################################################ # SFLphone ################################################ +* 2012-01-08: 1.2.2 has been released + * 2012-01-08: 1.2.1 has been released - Full annoucement here: http://sflphone.org/news/stable-version-121-released * 2012-08-10: 1.2.0 has been released diff --git a/daemon/configure.ac b/daemon/configure.ac index a23b5187ea0206db8343d7408ea7559d223e74dc..93f5e5f827263d4316845e3c850962ad9e147e15 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.2.1],[sflphoneteam@savoirfairelinux.com],[sflphone]) +AC_INIT([sflphone],[1.2.2],[sflphoneteam@savoirfairelinux.com],[sflphone]) AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012]]) AC_REVISION([$Revision$]) diff --git a/daemon/src/audio/codecs/audiocodec.h b/daemon/src/audio/codecs/audiocodec.h index f05a511bc3587c55f21b96813ca7779109534503..7505a528f218bf4f47ed4c39d2b91b31eba9025a 100644 --- a/daemon/src/audio/codecs/audiocodec.h +++ b/daemon/src/audio/codecs/audiocodec.h @@ -37,8 +37,8 @@ #include <ccrtp/formats.h> // for ost::DynamicPayloadFormat /* bump when codec binary interface changes */ -#define AUDIO_CODEC_ENTRY create_1_2_1 -#define AUDIO_CODEC_ENTRY_SYMBOL "create_1_2_1" +#define AUDIO_CODEC_ENTRY create_1_2_2 +#define AUDIO_CODEC_ENTRY_SYMBOL "create_1_2_2" // We assume all decoders will be fed 20ms of audio or less // And we'll resample them to 44.1kHz or less diff --git a/gnome/configure.ac b/gnome/configure.ac index f46b919e3aeadedf0e5944d9cf1ffe5ea0f170fa..6f90ec9e41db62c66791a1eeba3a626e178d8f46 100644 --- a/gnome/configure.ac +++ b/gnome/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([sflphone],[1.2.1],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome]) +AC_INIT([sflphone],[1.2.2],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE diff --git a/plugins/configure.ac b/plugins/configure.ac index 38100bb9a8fcb41764d4cb1984cca246aac8e2dc..46473fbdf476d02cf19bb6f63fd262a451267339 100644 --- a/plugins/configure.ac +++ b/plugins/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([sflphone],[1.2.1],[sflphoneteam@savoirfairelinux.com],[sflphone-plugins]) +AC_INIT([sflphone],[1.2.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 81734ecba0a92a0f49467b5d2221fb16d473e4bd..8c5b0bc372b2b7d38accd43a9a1ab13cd635a846 100755 --- a/tools/build-system/launch-build-machine-jenkins.sh +++ b/tools/build-system/launch-build-machine-jenkins.sh @@ -22,7 +22,7 @@ DO_LOGGING=1 DO_UPLOAD=1 SNAPSHOT_TAG=`date +%Y%m%d` TAG_NAME_PREFIX= -VERSION_NUMBER="1.2.1" +VERSION_NUMBER="1.2.2" LAUNCHPAD_PACKAGES=("sflphone-common" "sflphone-client-kde" "sflphone-client-gnome" "sflphone-plugins" "sflphone-common-video" "sflphone-client-gnome-video") #LAUNCHPAD_PACKAGES=("sflphone-common-video" "sflphone-client-gnome-video")