From 7b62728dc1614bd2cf157577b0bd86607c760bc1 Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Mon, 10 Jun 2013 17:31:31 -0400
Subject: [PATCH] [#25528] Update doc with new version number, and jenkins
script
---
NEWS | 7 +++++--
daemon/configure.ac | 3 ++-
daemon/src/audio/codecs/audiocodec.h | 2 +-
gnome/configure.ac | 2 +-
plugins/configure.ac | 2 +-
tools/build-system/launch-build-machine-jenkins.sh | 2 +-
6 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/NEWS b/NEWS
index d1f48c548a..6dcc7921d2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,12 @@
################################################
# SFLphone
################################################
-* 2012-01-08: 1.2.2 has been released
+#
+* 2013-06-11: 1.2.3 has been released
-* 2012-01-08: 1.2.1 has been released - Full annoucement here: http://sflphone.org/news/stable-version-121-released
+* 2013-01-08: 1.2.2 has been released
+
+* 2013-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 e82b48d507..7e3fec17a4 100644
--- a/daemon/configure.ac
+++ b/daemon/configure.ac
@@ -2,7 +2,8 @@ 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.2],[sflphoneteam@savoirfairelinux.com],[sflphone])
+AC_INIT([sflphone],[1.2.3],[sflphoneteam@savoirfairelinux.com],[sflphone])
+
AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013]])
AC_REVISION([$Revision$])
diff --git a/daemon/src/audio/codecs/audiocodec.h b/daemon/src/audio/codecs/audiocodec.h
index 7505a528f2..0899c3aecc 100644
--- a/daemon/src/audio/codecs/audiocodec.h
+++ b/daemon/src/audio/codecs/audiocodec.h
@@ -38,7 +38,7 @@
/* bump when codec binary interface changes */
#define AUDIO_CODEC_ENTRY create_1_2_2
-#define AUDIO_CODEC_ENTRY_SYMBOL "create_1_2_2"
+#define AUDIO_CODEC_ENTRY_SYMBOL "create_1_2_3"
// 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 ae481fa0a2..87486c077a 100644
--- a/gnome/configure.ac
+++ b/gnome/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.64])
-AC_INIT([sflphone],[1.2.2],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome])
+AC_INIT([sflphone],[1.2.3],[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 2967c5a18c..4117717743 100644
--- a/plugins/configure.ac
+++ b/plugins/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([sflphone],[1.2.2],[sflphoneteam@savoirfairelinux.com],[sflphone-plugins])
+AC_INIT([sflphone],[1.2.3],[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 8c5b0bc372..fe3481d7a1 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.2"
+VERSION_NUMBER="1.2.3"
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