From fa8ca51eea6e9f80772071dd327d1768adca1289 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Mon, 13 Jan 2014 17:06:46 -0500
Subject: [PATCH] * #37950: Bump version numbers for Release 1.3.0
---
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 | 7 ++++++-
8 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/NEWS b/NEWS
index 6dcc7921d2..fc927d2cca 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@
# SFLphone
################################################
#
+* 2014-01-13: 1.3.0 has been released
+
* 2013-06-11: 1.2.3 has been released
* 2013-01-08: 1.2.2 has been released
diff --git a/daemon/configure.ac b/daemon/configure.ac
index 11deea38e5..5c2c06065b 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.3],[sflphoneteam@savoirfairelinux.com],[sflphone])
+AC_INIT([sflphone],[1.3.0],[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/doc/doxygen/core-doc.cfg.in b/daemon/doc/doxygen/core-doc.cfg.in
index 4bef6c6cdd..42850012d0 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.2.3
+PROJECT_NUMBER = 1.3.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 0cd33565f7..04bfe98f8b 100644
--- a/daemon/src/audio/codecs/audiocodec.h
+++ b/daemon/src/audio/codecs/audiocodec.h
@@ -40,7 +40,7 @@
#define STR(s) #s
/* bump when codec binary interface changes */
-#define AUDIO_CODEC_ENTRY create_1_2_3
+#define AUDIO_CODEC_ENTRY create_1_3_0
#define AUDIO_CODEC_ENTRY_SYMBOL XSTR(AUDIO_CODEC_ENTRY)
// We assume all decoders will be fed 20ms of audio or less
diff --git a/gnome/configure.ac b/gnome/configure.ac
index 51a13d40bd..c50ba58a99 100644
--- a/gnome/configure.ac
+++ b/gnome/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.64])
-AC_INIT([sflphone],[1.2.3],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome])
+AC_INIT([sflphone],[1.3.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 6681a33929..7cc09ec70a 100644
--- a/plugins/configure.ac
+++ b/plugins/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([sflphone],[1.2.3],[sflphoneteam@savoirfairelinux.com],[sflphone-plugins])
+AC_INIT([sflphone],[1.3.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 3523f0eaf3..86ffefb662 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.3"
+VERSION_NUMBER="1.3.0"
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")
diff --git a/tools/build-system/rpm/sflphone.spec b/tools/build-system/rpm/sflphone.spec
index a1166d0d5b..8f30576223 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.2.3
+Version: 1.3.0
Release: 1%{?dist}
Summary: SIP/IAX2 compatible enterprise-class software phone
Group: Applications/Internet
@@ -258,6 +258,11 @@ fi
%endif
%changelog
+* Mon Jan 13 2014 Tristan Matthews <tristan.matthews@savoirfairelinux.com> - 1.3.0-1
+- Update to 1.3.0
+- Fix KDE paths (tested on f20)
+- Added libuuid dependency for pjsip
+
* Wed Jun 19 2013 Simon Piette <simonp@fedoraproject.org> - 1.2.3-1
- Update to 1.2.3
- Enable ilbc
--
GitLab