Skip to content
Snippets Groups Projects
Commit a0f7803f authored by Tristan Matthews's avatar Tristan Matthews
Browse files

Start development of 1.4.1

From now on, version numbers will be incremented immediately after
tagging a release. NEWS is deliberately omitted, since it should
be updated before tagging a release (since it announces a new release).

Refs #51465

Change-Id: Ic763f2d19dfc8a7b292a8ece163f7064983c9f07
parent 13aa9c1b
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,7 @@ dnl SFLPhone - configure.ac for automake 1.9 and autoconf 2.59 ...@@ -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. dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.65]) AC_PREREQ([2.65])
AC_INIT([sflphone],[1.4.0],[sflphoneteam@savoirfairelinux.com],[sflphone]) AC_INIT([sflphone],[1.4.1],[sflphoneteam@savoirfairelinux.com],[sflphone])
AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014]]) AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014]])
AC_REVISION([$Revision$]) AC_REVISION([$Revision$])
......
...@@ -31,7 +31,7 @@ PROJECT_NAME = "SFLphone Daemon" ...@@ -31,7 +31,7 @@ PROJECT_NAME = "SFLphone Daemon"
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # if some version control system is used.
PROJECT_NUMBER = 1.4.0 PROJECT_NUMBER = 1.4.1
# Using the PROJECT_BRIEF tag one can provide an optional one line description # 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 # for a project that appears at the top of each page and should give viewer
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#define STR(s) #s #define STR(s) #s
/* bump for each release, and bump the 0.0.0.xth digit for each API change */ /* bump for each release, and bump the 0.0.0.xth digit for each API change */
#define AUDIO_CODEC_ENTRY create_1_4_0_0 #define AUDIO_CODEC_ENTRY create_1_4_1_0
#define AUDIO_CODEC_ENTRY_SYMBOL XSTR(AUDIO_CODEC_ENTRY) #define AUDIO_CODEC_ENTRY_SYMBOL XSTR(AUDIO_CODEC_ENTRY)
// Opus documentation: // Opus documentation:
......
AC_PREREQ([2.64]) AC_PREREQ([2.64])
AC_INIT([sflphone],[1.4.0],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome]) AC_INIT([sflphone],[1.4.1],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
......
AC_INIT([sflphone],[1.4.0],[sflphoneteam@savoirfairelinux.com],[sflphone-plugins]) AC_INIT([sflphone],[1.4.1],[sflphoneteam@savoirfairelinux.com],[sflphone-plugins])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
......
...@@ -46,7 +46,7 @@ DO_LOGGING=1 ...@@ -46,7 +46,7 @@ DO_LOGGING=1
DO_UPLOAD=1 DO_UPLOAD=1
SNAPSHOT_TAG=`date +%Y%m%d` SNAPSHOT_TAG=`date +%Y%m%d`
TAG_NAME_PREFIX= TAG_NAME_PREFIX=
VERSION_NUMBER="1.4.0" VERSION_NUMBER="1.4.1"
LAUNCHPAD_PACKAGES=("sflphone-daemon" "sflphone-kde" "sflphone-gnome" "sflphone-plugins" "sflphone-daemon-video" "sflphone-gnome-video") LAUNCHPAD_PACKAGES=("sflphone-daemon" "sflphone-kde" "sflphone-gnome" "sflphone-plugins" "sflphone-daemon-video" "sflphone-gnome-video")
......
%bcond_with video %bcond_with video
Name: sflphone Name: sflphone
Version: 1.4.0 Version: 1.4.1
%if 0%{?nightly} %if 0%{?nightly}
%define rel rc%{nightly} %define rel rc%{nightly}
%define tarball %{name}-%{version}-rc%{nightly} %define tarball %{name}-%{version}-rc%{nightly}
...@@ -267,6 +267,9 @@ fi ...@@ -267,6 +267,9 @@ fi
%endif %endif
%changelog %changelog
* Tue Jul 15 2014 Tristan Matthews <tristan.matthews@savoirfairelinux.com> - 1.4.1-1
- Start development of 1.4.1
* Tue Jul 15 2014 Tristan Matthews <tristan.matthews@savoirfairelinux.com> - 1.4.0-1 * Tue Jul 15 2014 Tristan Matthews <tristan.matthews@savoirfairelinux.com> - 1.4.0-1
- Update to 1.4.0 - Update to 1.4.0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment