From 766395025195a2d6db072336e346d93a8f762636 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Mon, 14 Jan 2013 11:15:35 -0500
Subject: [PATCH] * #19246: build: bump version numbers for 1.2.2
---
NEWS | 2 ++
daemon/configure.ac | 2 +-
daemon/src/audio/codecs/audiocodec.h | 4 ++--
gnome/configure.ac | 2 +-
plugins/configure.ac | 2 +-
tools/build-system/launch-build-machine-jenkins.sh | 2 +-
6 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/NEWS b/NEWS
index 3dff759009..d1f48c548a 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 a23b5187ea..93f5e5f827 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 f05a511bc3..7505a528f2 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 f46b919e3a..6f90ec9e41 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 38100bb9a8..46473fbdf4 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 81734ecba0..8c5b0bc372 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")
--
GitLab